Merge PR #507 into 16.0

Signed-off-by pedrobaeza
brain-tec · Apr 10, 2024 · 6bb6fd1 · 6bb6fd1
2 parents 4047ee8 + e062474
commit 6bb6fd1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/account_commission/views/report_settlement_templates.xml b/account_commission/views/report_settlement_templates.xml
@@ -38,11 +38,5 @@
                 </td>
             </t>
         </xpath>
-        <xpath expr="//table/tfoot/tr/td" position="before">
-            <t t-if="o.settlement_type == 'sale_invoice'">
-                <td />
-                <td />
-            </t>
-        </xpath>
     </template>
 </odoo>
diff --git a/commission/reports/report_settlement_templates.xml b/commission/reports/report_settlement_templates.xml
@@ -51,21 +51,31 @@
                                 </td>
                             </tr>
                         </tbody>
-                        <tfoot>
-                            <tr>
-                                <td />
-                                <td class="text-end">
-                                    <strong>Total</strong>
-                                </td>
-                                <td class="text-end">
-                                    <span
-                                        t-field="o.total"
-                                        t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
-                                    />
-                                </td>
-                            </tr>
-                        </tfoot>
                     </table>
+                    <div class="mb-4">
+                        <div id="total" class="row">
+                            <div
+                                t-attf-class="#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ms-auto"
+                            >
+                                <table
+                                    class="table table-sm table-borderless"
+                                    style="page-break-inside: avoid;"
+                                >
+                                    <tr class="border-black o_total">
+                                        <td>
+                                            <strong>Total</strong>
+                                        </td>
+                                        <td class="text-end">
+                                            <span
+                                                t-field="o.total"
+                                                t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
+                                            />
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </t>