Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #774 into 14.0 

Signed-off-by AaronHForgeFlow
pull/780/head
OCA-git-bot 2021-04-29 10:57:15 +00:00
parent 28c143e47c 60288fd28f
commit d06170df89
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
account_financial_report/report/templates/vat_report.xml
View File

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

1
account_financial_report/tests/test_journal_ledger.py
View File

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