Merge PR #774 into 14.0

Signed-off-by AaronHForgeFlow

account_financial_report/report/templates/vat_report.xml

@@ -72,34 +72,17 @@
                         </div>
                         <div class="act_as_cell amount" style="width: 15%;">
                             <t
-                                t-set="domain"
-                                t-value="[('tax_ids', 'in', [tax.tax_id.id for tax in tag.tax_ids]),
-                                        ('date', '&gt;=', o.date_from),
-                                        ('date', '&lt;=', o.date_to)]"
+                                t-att-style="style"
+                                t-raw="tag_or_group['net']"
+                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
-                            <span t-att-domain="domain" res-model="account.move.line">
-                                <t
-                                    t-att-style="style"
-                                    t-raw="tag_or_group['net']"
-                                    t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                                />
-                            </span>
                         </div>
                         <div class="act_as_cell amount" style="width: 15%;">
                             <t
-                                t-set="domain"
-                                t-value="[('tax_line_id', 'in', [tax.tax_id.id for tax in tag.tax_ids]),
-                                        ('date', '&gt;=', o.date_from),
-                                        ('date', '&lt;=', o.date_to),
-                                        ('tax_exigible', '=', True)]"
+                                t-att-style="style"
+                                t-raw="tag_or_group['tax']"
+                                t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                             />
-                            <span t-att-domain="domain" res-model="account.move.line">
-                                <t
-                                    t-att-style="style"
-                                    t-raw="tag_or_group['tax']"
-                                    t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                                />
-                            </span>
                         </div>
                     </div>
                     <t t-if="tax_detail">
@@ -111,7 +94,7 @@
                                     style="padding-left: 20px; width: 65%;"
                                 >
                                     <span
-                                        t-att-res-id="tax.tax_id.id"
+                                        t-att-res-id="tax['id']"
                                         t-att-res-model="res_model"
                                         view-type="form"
                                     >
@@ -121,9 +104,9 @@
                                 <div class="act_as_cell amount" style="width: 15%;">
                                     <t
                                         t-set="domain"
-                                        t-value="[('tax_ids', 'in', tax.tax_id.ids),
-                                                ('date', '&gt;=', o.date_from),
-                                                ('date', '&lt;=', o.date_to),
+                                        t-value="[('tax_ids', 'in', tax['id']),
+                                                ('date', '&gt;=', date_from),
+                                                ('date', '&lt;=', date_to),
                                                 ('tax_exigible', '=', True)]"
                                     />
                                     <span
@@ -140,9 +123,9 @@
                                 <div class="act_as_cell amount" style="width: 15%;">
                                     <t
                                         t-set="domain"
-                                        t-value="[('tax_line_id', '=', tax.tax_id.id),
-                                                ('date', '&gt;=', o.date_from),
-                                                ('date', '&lt;=', o.date_to),
+                                        t-value="[('tax_line_id', '=', tax['id']),
+                                                ('date', '&gt;=', date_from),
+                                                ('date', '&lt;=', date_to),
                                                 ('tax_exigible', '=', True)]"
                                     />
                                     <span

account_financial_report/tests/test_journal_ledger.py

@@ -251,6 +251,7 @@ class TestJournalReport(AccountTestInvoicingCommon):
             line_form.account_id = self.expense_account
             line_form.tax_ids.add(self.tax_15_p)
             line_form.tax_ids.add(self.tax_20_p)
+        move_form.invoice_date = move_form.date
         invoice = move_form.save()
         invoice.action_post()