Fix test failures

ledgersmb · Apr 29, 2023 · 721ca32 · 721ca32
1 parent 1b262cd
commit 721ca32
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/UI/Reports/filters/gl.html b/UI/Reports/filters/gl.html
@@ -162,47 +162,47 @@
                              value="X"
                              checked = "checked"
                              } %]&nbsp;[% text('All') %]</td>
-                      <td align="left">
+                    <td align="left">
                       [% PROCESS input element_data = {
                              name="category"
                              id="category-asset"
                              class="radio"
                              type="radio"
                              value="A"
                              } %]&nbsp;[% text('Asset') %]</td>
-                      <td align="left">
+                    <td align="left">
                       [% PROCESS input element_data = {
                              name="category"
                              id="category-liability"
                              class="radio"
                              type="radio"
                              value="L"
                              } %]&nbsp;[% text('Liability') %]</td>
-                      <td align="left">
+                    <td align="left">
                       [% PROCESS input element_data = {
                              name="category"
                              id="category-equity"
                              class="radio"
                              type="radio"
                              value="Q"
                              } %]&nbsp;[% text('Equity') %]</td>
-                      <td align="left">
+                    <td align="left">
                       [% PROCESS input element_data = {
                              name="category"
                              id="category-income"
                              class="radio"
                              type="radio"
                              value="I"
                              } %]&nbsp;[% text('Income') %]</td>
-                      <td align="left">
+                    <td align="left">
                       [% PROCESS input element_data = {
                              name="category"
                              id="category-expense"
                              class="radio"
                              type="radio"
                              value="E"
                              } %]&nbsp;[% text('Expense') %]
-                      </td>
+                    </td>
                   </tr>
                 </table>
               </td>
@@ -246,8 +246,8 @@
                                           value="1"
                                           checked="checked"
                                           } %] [% text('Description') %]</td>
-                      </tr>
-                      <tr>
+                  </tr>
+                  <tr>
                         <td nowrap>[% PROCESS input element_data = {
                                           name="col_debits"
                                           class="checkbox"
@@ -280,8 +280,8 @@
                                           type="checkbox"
                                           value="1"
                                           } %] [% text('FX Credit') %]</td>
-                      </tr>
-                      <tr>
+                  </tr>
+                  <tr>
                         <td nowrap>[% PROCESS input element_data = {
                                           name="col_source"
                                           class="checkbox"
@@ -307,8 +307,8 @@
                                           type="checkbox"
                                           value="1"
                                           } %] [% text('Till') %]</td>
-                      </tr>
-                      <tr>
+                  </tr>
+                  <tr>
                         <td nowrap>[% PROCESS input element_data = {
                                           name="col_accno"
                                           class="checkbox"
@@ -340,13 +340,10 @@
                                           type="checkbox"
                                           value="1"
                                           } %] [% text('Subtotal') %]</td>
-                      </tr>
-                    </table>
                   </tr>
                 </table>
               </td>
             </tr>
-
           </table>
         </td>
       </tr>

diff --git a/xt/42-report.pg b/xt/42-report.pg
@@ -20,9 +20,9 @@ BEGIN;
 --    SELECT has_function('business_type__list','{}'::text[]);
     SELECT has_function('report__aa_outstanding',ARRAY['integer','integer','text','text','integer','integer[]','text','boolean','date','date','text','integer']);
     SELECT has_function('report__aa_outstanding_details',ARRAY['integer','integer','text','text','integer','integer[]','text','boolean','date','date','text','integer']);
-    SELECT has_function('report__aa_transactions',ARRAY['integer','integer','text','text','integer','integer','text','text','text','text','text','text','text','date','date','boolean','boolean','integer','boolean','boolean','boolean','text']);
+    SELECT has_function('report__aa_transactions',ARRAY['integer','integer','text','text','integer','integer','text','text','text','text','text','text','text','date','date','boolean','boolean','integer','boolean','boolean','boolean','boolean','text']);
     SELECT has_function('report__general_balance',ARRAY['date','date']);
-    SELECT has_function('report__gl',ARRAY['text','text','character','text','text','text','date','date','boolean','numeric','numeric','integer[]']);
+    SELECT has_function('report__gl',ARRAY['text','text','character','text','text','text','date','date','boolean','boolean','numeric','numeric','integer[]']);
     SELECT has_function('report__incoming_cogs_line',ARRAY['date','date','text','text']);
     SELECT has_function('report__invoice_aging_detail',ARRAY['integer','integer','integer','text','date','integer[]','boolean','text']);
     SELECT has_function('report__invoice_aging_summary',ARRAY['integer','integer','integer','text','date','integer[]','boolean','text']);
@@ -50,6 +50,7 @@ COPY acc_trans(trans_id,chart_id,amount_bc,curr,amount_tc,transdate,approved,ent
                      '1899-12-31'::date, -- from_date
                      '1900-01-01'::date, -- to_date
                      NULL, -- approved
+                     NULL, -- voided
                      NULL, NULL, -- from_amount, to_amount
                      NULL -- business_units
                      );
@@ -65,6 +66,7 @@ COPY acc_trans(trans_id,chart_id,amount_bc,curr,amount_tc,transdate,approved,ent
                      NULL, -- from_date
                      '1900-01-01'::date, -- to_date
                      NULL, -- approved
+                     NULL, -- voided
                      NULL, NULL, -- from_amount, to_amount
                      NULL -- business_units
                      );
@@ -80,6 +82,7 @@ COPY acc_trans(trans_id,chart_id,amount_bc,curr,amount_tc,transdate,approved,ent
                      '1900-01-01'::date, -- from_date
                      '1900-01-02'::date, -- to_date
                      NULL, -- approved
+                     NULL, -- voided
                      NULL, NULL, -- from_amount, to_amount
                      NULL -- business_units
                      );
@@ -95,6 +98,7 @@ COPY acc_trans(trans_id,chart_id,amount_bc,curr,amount_tc,transdate,approved,ent
                      '1900-01-02'::date, -- from_date
                      '1900-01-03'::date, -- to_date
                      NULL, -- approved
+                     NULL, -- voided
                      NULL, NULL, -- from_amount, to_amount
                      NULL -- business_units
                      );