From 71e60f76b3dc4a181b701d12ffd4408faf3063d0 Mon Sep 17 00:00:00 2001 From: "matteo.tognini" Date: Fri, 12 Jul 2024 11:36:22 +0200 Subject: [PATCH] [FIX]l10n_it_declaration_of_intent: #2329, #3311 --- .../models/account_move.py | 16 ++++------------ .../models/declaration.py | 4 ++-- .../tests/test_declaration_of_intent.py | 2 -- .../tests/data/IT06363391001_00001.xml | 2 +- .../tests/data/IT06363391001_00002.xml | 2 +- .../tests/data/IT06363391001_00003.xml | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/l10n_it_declaration_of_intent/models/account_move.py b/l10n_it_declaration_of_intent/models/account_move.py index 59f690f453b3..981a7f77df46 100644 --- a/l10n_it_declaration_of_intent/models/account_move.py +++ b/l10n_it_declaration_of_intent/models/account_move.py @@ -158,18 +158,10 @@ def update_declarations(self, declarations_used_amounts, grouped_lines): if is_sale_document: cmt = self.narration or "" msg = ( - "Vostra dichiarazione d'intento nr " - "{partner_number} del {partner_date}, " - "nostro protocollo nr {number} del {date}, " - "protocollo telematico nr {protocol}.".format( - partner_number=declaration.partner_document_number, - partner_date=format_date( - self.env, declaration.partner_document_date - ), - number=declaration.number, - date=format_date(self.env, declaration.date), - protocol=declaration.telematic_protocol, - ) + f"Vostra dichiarazione d'intento del " + f"{format_date(self.env, declaration.date)}, " + f"protocollo telematico nr " + f"{declaration.telematic_protocol}." ) # Avoid duplication if msg not in cmt: diff --git a/l10n_it_declaration_of_intent/models/declaration.py b/l10n_it_declaration_of_intent/models/declaration.py index aadfc4345446..027749620286 100644 --- a/l10n_it_declaration_of_intent/models/declaration.py +++ b/l10n_it_declaration_of_intent/models/declaration.py @@ -53,10 +53,10 @@ def _default_currency(self): partner_id = fields.Many2one("res.partner", string="Partner", required=True) telematic_protocol = fields.Char(required=True) partner_document_number = fields.Char( - required=True, string="Document Number", help="Number of partner's document" + string="Document Number", help="Number of partner's document" ) partner_document_date = fields.Date( - required=True, string="Document Date", help="Date of partner's document" + string="Document Date", help="Date of partner's document" ) taxes_ids = fields.Many2many("account.tax", string="Taxes", required=True) used_amount = fields.Monetary(compute="_compute_amounts", store=True) diff --git a/l10n_it_declaration_of_intent/tests/test_declaration_of_intent.py b/l10n_it_declaration_of_intent/tests/test_declaration_of_intent.py index 5ee7928628d8..19ee55353b4f 100644 --- a/l10n_it_declaration_of_intent/tests/test_declaration_of_intent.py +++ b/l10n_it_declaration_of_intent/tests/test_declaration_of_intent.py @@ -19,8 +19,6 @@ def _create_declaration(cls, partner, type_d): return cls.env["l10n_it_declaration_of_intent.declaration"].create( { "partner_id": partner.id, - "partner_document_number": "PartnerTest%s" % partner.id, - "partner_document_date": cls.today_date, "date": cls.today_date, "date_start": cls.today_date, "date_end": cls.today_date, diff --git a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00001.xml b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00001.xml index f1c788d9bfdf..d76aac44c98a 100644 --- a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00001.xml +++ b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00001.xml @@ -68,7 +68,7 @@ 2016-06-15 INV/2016/00001 14.00 - Vostra dichiarazione d'intento nr DI/111 del 06/15/2016, nostro protocollo nr 1 del 06/15/2016, protocollo telematico nr 08060120341234567-000001. + Vostra dichiarazione d'intento del 06/15/2016, protocollo telematico nr 08060120341234567-000001. SI diff --git a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00002.xml b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00002.xml index 52b826dbd55a..962f01376ab4 100644 --- a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00002.xml +++ b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00002.xml @@ -68,7 +68,7 @@ 2016-06-15 INV/2016/00001 14.00 - Vostra dichiarazione d'intento nr DI/111 del 06/15/2016, nostro protocollo nr 1 del 06/15/2016, protocollo telematico nr 08060120341234567-000001. + Vostra dichiarazione d'intento del 06/15/2016, protocollo telematico nr 08060120341234567-000001. SI diff --git a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00003.xml b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00003.xml index cac6d165790c..73c8811902ce 100644 --- a/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00003.xml +++ b/l10n_it_fatturapa_out_di/tests/data/IT06363391001_00003.xml @@ -68,7 +68,7 @@ 2016-06-15 INV/2016/00001 14.00 - Vostra dichiarazione d'intento nr DI/112 del 06/15/2016, nostro protocollo nr 1 del 06/15/2016, protocollo telematico nr 08060120341234567-000002. + Vostra dichiarazione d'intento del 06/15/2016, protocollo telematico nr 08060120341234567-000002. SI