Merge pull request #97 from ggoffy/master

fixed bug in numbering transactions
XoopsModules25x · Mar 11, 2023 · b2f54aa · b2f54aa
2 parents 0daec7a + c01d07a
commit b2f54aa
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 14,876 deletions.
diff --git a/class/TransactionsHandler.php b/class/TransactionsHandler.php
@@ -213,7 +213,7 @@ public static function getFormFilter($filterFrom, $filterTo, $allId, $asId, $acc
             }
             $form->addElement($traCliidSelect);
         }
-        if ($permApprove) {
+        if ($permApprove && 'list' === $op) {
             //linebreak
             $form->addElement(new \XoopsFormHidden('linebreak', ''));
             // Form Select Status traStatus

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,3 +1,8 @@
+==============================================================
+1.3.1 Stable [2023/03/11]
+==============================================================
+ - fixed bug in numbering transactions (goffy)
+
 ==============================================================
 1.3.0 Stable [2023/02/28]
 ==============================================================

diff --git a/navbar.php b/navbar.php
@@ -81,7 +81,7 @@
         $nav_items2[] = ['href' => 'transactions.php?op=list', 'icon' => '<i class="fa fa-list-ol fa-fw fa-lg"></i>','label' => \_MA_WGSIMPLEACC_TRANSACTIONS_LIST, 'sub_items3' => []];
         $nav_items2[] = ['href' => 'transactions.php?op=new&tra_type=3', 'icon' => '<i class="fa fa-plus-square fa-fw fa-lg"></i>', 'label' => \_MA_WGSIMPLEACC_TRANSACTION_SUBMIT_INCOME, 'sub_items3' => []];
         $nav_items2[] = ['href' => 'transactions.php?op=new&tra_type=2', 'icon' => '<i class="fa fa-plus-square fa-fw fa-lg"></i>', 'label' => \_MA_WGSIMPLEACC_TRANSACTION_SUBMIT_EXPENSE, 'sub_items3' => []];
-        if ($permissionsHandler->getPermGlobalApprove()) {
+        if ($permissionsHandler->getPermTransactionsApprove()) {
             $nav_items2[] = ['href' => 'transactions.php?op=listhist', 'icon' => '<i class="fa fa-trash fa-fw fa-lg"></i>', 'label' => \_MA_WGSIMPLEACC_TRAHISTORY_DELETED, 'sub_items3' => []];
         }
         $nav_items1[] = ['href' => '#', 'icon' => '<i class="fa fa-files-o fa-fw fa-lg"></i>', 'label' => \_MA_WGSIMPLEACC_TRANSACTIONS, 'sub_items2' => $nav_items2];

diff --git a/templates/admin/wgsimpleacc_admin_trahistories.tpl b/templates/admin/wgsimpleacc_admin_trahistories.tpl
@@ -54,7 +54,10 @@
                     <td class='center'><{$transaction.amountout}></td>
                     <td class='center'><{$transaction.taxid}></td>
                     <td class='center'><{$transaction.asset}></td>
-                    <td class='center'><img src="<{$modPathIcon16}>status<{$transaction.status}>.png" alt="<{$transaction.status_text}>" title="<{$transaction.status_text}>"></td>
+                    <td class='center'>
+                        <img src="<{$modPathIcon16}>status<{$transaction.status}>.png" alt="<{$transaction.status_text}>" title="<{$transaction.status_text}>">
+                        (<{$transaction.status}> <{$transaction.status_text}>)
+                    </td>
                     <td class='center'><{$transaction.comments}></td>
                     <td class='center'><{$transaction.class_text}></td>
                     <td class='center'><{$transaction.balid}></td>

diff --git a/templates/admin/wgsimpleacc_admin_transactions.tpl b/templates/admin/wgsimpleacc_admin_transactions.tpl
@@ -48,7 +48,10 @@
                         <td class='center'><{$transaction.taxid}></td>
                         <td class='center'><{$transaction.asset}></td>
                         <td class='center'><{$transaction.client}></td>
-                        <td class='center'><img src="<{$modPathIcon16}>status<{$transaction.status}>.png" alt="<{$transaction.status_text}>" title="<{$transaction.status_text}>"></td>
+                        <td class='center'>
+                            <img src="<{$modPathIcon16}>status<{$transaction.status}>.png" alt="<{$transaction.status_text}>" title="<{$transaction.status_text}>">
+                            (<{$transaction.status}> <{$transaction.status_text}>)
+                        </td>
                         <td class='center'><{$transaction.comments}></td>
                         <td class='center'><{$transaction.class_text}></td>
                         <td class='center'><{$transaction.balid}></td>

diff --git a/testdata/german/group_permission.yml b/testdata/german/group_permission.yml
diff --git a/testdata/german/index.php b/testdata/german/index.php
diff --git a/testdata/german/wgsimpleacc_accounts.yml b/testdata/german/wgsimpleacc_accounts.yml