diff options
| author | Katherine Zaoral <kz@adhoc.com.ar> | 2020-07-17 13:46:46 +0000 |
|---|---|---|
| committer | Katherine Zaoral <kz@adhoc.com.ar> | 2020-08-17 14:09:18 +0000 |
| commit | 1931a228350e63714ffbc97b8f3a708085abf476 (patch) | |
| tree | 244006ed1835e8204cfab3b32a3ed5c286c51f72 /addons/l10n_ar/models | |
| parent | 1c5ca6a16ddf2ba5b311d411a7523fd1f7360a2c (diff) | |
[IMP] l10n_ar: Argentinean invoice report
Port foward from 13.0 branch. Also update the _get_name_invoice_report()
method to match the one in account module.
Also update the name of payment field that has been change in master version
* o.invoice_payment_ref is now o.payment_reference
Diffstat (limited to 'addons/l10n_ar/models')
| -rw-r--r-- | addons/l10n_ar/models/account_move.py | 16 | ||||
| -rw-r--r-- | addons/l10n_ar/models/res_company.py | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/addons/l10n_ar/models/account_move.py b/addons/l10n_ar/models/account_move.py index c6617ee81a7..b8bd0b01274 100644 --- a/addons/l10n_ar/models/account_move.py +++ b/addons/l10n_ar/models/account_move.py @@ -213,16 +213,6 @@ class AccountMove(models.Model): [('l10n_ar_letter', '=', self.l10n_latam_document_type_id.l10n_ar_letter)]).ids) return where_string, param - def _get_name_invoice_report(self, report_xml_id): - self.ensure_one() - if self.l10n_latam_use_documents and self.company_id.country_id.code == 'AR': - custom_report = { - 'account.report_invoice_document_with_payments': 'l10n_ar.report_invoice_document_with_payments', - 'account.report_invoice_document': 'l10n_ar.report_invoice_document', - } - return custom_report.get(report_xml_id) or report_xml_id - return super()._get_name_invoice_report(report_xml_id) - def _l10n_ar_get_amounts(self, company_currency=False): """ Method used to prepare data to present amounts and taxes related amounts when creating an electronic invoice for argentinian and the txt files for digital VAT books. Only take into account the argentinian taxes """ @@ -279,3 +269,9 @@ class AccountMove(models.Model): res += [{'Id': '3', 'BaseImp': vat_base_0, 'Importe': 0.0}] return res if res else [] + + def _get_name_invoice_report(self): + self.ensure_one() + if self.l10n_latam_use_documents and self.company_id.country_id.code == 'AR': + return 'l10n_ar.report_invoice_document' + return super()._get_name_invoice_report() diff --git a/addons/l10n_ar/models/res_company.py b/addons/l10n_ar/models/res_company.py index cdba6dbd784..72bd820f979 100644 --- a/addons/l10n_ar/models/res_company.py +++ b/addons/l10n_ar/models/res_company.py @@ -15,7 +15,7 @@ class ResCompany(models.Model): l10n_ar_afip_responsibility_type_id = fields.Many2one( domain="[('code', 'in', [1, 4, 6])]", related='partner_id.l10n_ar_afip_responsibility_type_id', readonly=False) l10n_ar_company_requires_vat = fields.Boolean(compute='_compute_l10n_ar_company_requires_vat', string='Company Requires Vat?') - l10n_ar_afip_start_date = fields.Date('Activities Start Date') + l10n_ar_afip_start_date = fields.Date('Activities Start') @api.onchange('country_id') def onchange_country(self): |