diff --git a/l10n_ar_sale/__manifest__.py b/l10n_ar_sale/__manifest__.py index 9f799ca..f93cd10 100644 --- a/l10n_ar_sale/__manifest__.py +++ b/l10n_ar_sale/__manifest__.py @@ -1,6 +1,6 @@ { 'name': 'Argentinian Sale Total Fields', - 'version': "16.0.1.1.0", + 'version': "16.0.1.2.0", 'category': 'Localization/Argentina', 'sequence': 14, 'author': 'ADHOC SA', diff --git a/l10n_ar_sale/models/sale_order.py b/l10n_ar_sale/models/sale_order.py index aec495e..6a1f6b8 100644 --- a/l10n_ar_sale/models/sale_order.py +++ b/l10n_ar_sale/models/sale_order.py @@ -106,3 +106,15 @@ def _get_name_sale_report(self, report_xml_id): if self.company_id.country_id.code == 'AR': return 'l10n_ar_sale.report_saleorder_document' return report_xml_id + + def _l10n_ar_include_vat(self): + self.ensure_one() + discriminate_taxes = self.sale_checkbook_id.discriminate_taxes + if discriminate_taxes == 'yes': + return True + elif discriminate_taxes == 'no': + return False + else: + return not ( + self.company_id.l10n_ar_company_requires_vat and + self.partner_id.l10n_ar_afip_responsibility_type_id.code in ['1'] or False) diff --git a/l10n_ar_sale/views/l10n_ar_sale_templates.xml b/l10n_ar_sale/views/l10n_ar_sale_templates.xml index 8d29bb8..4430937 100644 --- a/l10n_ar_sale/views/l10n_ar_sale_templates.xml +++ b/l10n_ar_sale/views/l10n_ar_sale_templates.xml @@ -38,5 +38,13 @@ + + diff --git a/l10n_ar_sale/views/sale_report_templates.xml b/l10n_ar_sale/views/sale_report_templates.xml index ed0f272..26c2109 100644 --- a/l10n_ar_sale/views/sale_report_templates.xml +++ b/l10n_ar_sale/views/sale_report_templates.xml @@ -139,6 +139,9 @@ + + l10n_ar_sale.document_tax_totals +