slapos_accounting: Use getMovementList to rather them contentValues

Use getMovementList to get Invoice Cell/Invoice Lines, it allows to get the aggregate properly. It makes list more consistent.

slapos_accounting: Use getMovementList to rather them contentValues
Use getMovementList to get Invoice Cell/Invoice Lines, it allows to get the aggregate properly. It makes list more consistent.
983b4d31 · Rafael Monnerat · a1053ad9 · 983b4d31
Commit 983b4d31 authored Jun 06, 2024 by Rafael Monnerat
Showing with 6 additions and 7 deletions

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_viewSlapOSPrintout.zpt ..._accounting/SaleInvoiceTransaction_viewSlapOSPrintout.zpt +6 -7

No files found.
--- a/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_viewSlapOSPrintout.zpt
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_viewSlapOSPrintout.zpt
@@ -2,6 +2,8 @@
 <html tal:define="quantity_renderer nocall:here/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_quantity/render_pdf;
                  price_renderer nocall:here/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_total_price/render_pdf;
                  total_not_tax_price_list python: [];
+                  movement_list python: context.getMovementList(portal_type=context.getPortalInvoiceMovementTypeList(),
+                                                                    sort_on=[('int_index', 'ascending'), ('reference', 'ascending')]);
                  invoice_resource_document python: context.portal_catalog.getResultValue(
                                                      portal_type='User Consumption HTML File',
                                                      validation_state='shared',
@@ -104,8 +106,7 @@
          </tr>
        </thead>
        <tbody>
-          <tal:block tal:repeat="line python: context.contentValues(portal_type=context.getPortalInvoiceMovementTypeList(),
+          <tal:block tal:repeat="line movement_list">
-                                                                    sort_on=[('int_index', 'ascending'), ('reference', 'ascending')])">
            <tr tal:condition="python: line.getUse('') != 'trade/tax'">
              <td><span tal:content="python: line.getReference() or line.getIntIndex()"></span></td>
              <td><span tal:content="python: line.getResourceReference('')"></span></td>
@@ -124,8 +125,7 @@
          <th><span>Total Excluding Tax</span></th>
          <td><span tal:content="python: price_renderer(sum(total_not_tax_price_list))"></span></td>
        </tr>
-        <tal:block tal:repeat="line python: context.contentValues(portal_type=context.getPortalInvoiceMovementTypeList(),
+        <tal:block tal:repeat="line movement_list">
-                                                                  sort_on=[('int_index', 'ascending'), ('reference', 'ascending')])">
          <tal:block tal:condition="python: line.getUse('') == 'trade/tax'">
            <tr>
              <th><span>Tax Rate</span></th>
@@ -150,9 +150,8 @@
      </div>
    </aside-->
-    <tal:block tal:define="invoice_line_list python: context.contentValues(portal_type='Invoice Line');
+    <tal:block tal:define="filter_portal_type python: {'portal_type': ['Instance Tree', 'Compute Node', 'Project']};
-                           filter_portal_type python: {'portal_type': ['Instance Tree', 'Compute Node', 'Project']};
+                           invoice_line_aggregate_list python: [i for i in movement_list if i.getAggregate(portal_type='Hosting Subscription') and i.getAggregate(**filter_portal_type)];
-                           invoice_line_aggregate_list python: [i for i in invoice_line_list if i.getAggregate(portal_type='Hosting Subscription') and i.getAggregate(**filter_portal_type)];
                           item_dict python: {}">
      <tal:block tal:condition="python: invoice_line_aggregate_list">
        <aside>