[IMP] l10n_br_account_payment_order: cnab discount date

Author: CristianoMafraJunior

l10n_br_account_payment_order/data/cnab_codes/banco_ailos_cnab_240.xml

@@ -133,6 +133,19 @@
             eval="[Command.link(ref('payment_mode_type_cnab240'))]"
         />
     </record>
+    <record id="ailos_instruction_16" model="l10n_br_cnab.code">
+        <field name="name">Alteração de Valor/Data de Desconto</field>
+        <field name="code">16</field>
+        <field name="code_type">instruction_move_code</field>
+        <field
+            name="bank_ids"
+            eval="[Command.link(ref('l10n_br_base.res_bank_085'))]"
+        />
+        <field
+            name="payment_method_ids"
+            eval="[Command.link(ref('payment_mode_type_cnab240'))]"
+        />
+    </record>
     <record id="ailos_instruction_31" model="l10n_br_cnab.code">
         <field
             name="name"

l10n_br_account_payment_order/demo/l10n_br_cnab_config_demo.xml

@@ -295,6 +295,7 @@
         <field name="sending_code_id" ref="ailos_instruction_01" />
         <field name="write_off_code_id" ref="ailos_instruction_02" />
         <field name="change_maturity_date_code_id" ref="ailos_instruction_06" />
+        <field name="change_discount_date_code_id" ref="ailos_instruction_16" />
         <field name="protest_title_code_id" ref="ailos_instruction_09" />
         <field name="suspend_protest_keep_wallet_code_id" ref="ailos_instruction_11" />
         <field name="suspend_protest_write_off_code_id" ref="ailos_instruction_10" />

l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py

@@ -252,6 +252,14 @@ class L10nBrCNABBoletoFields(models.AbstractModel):
         tracking=True,
     )
 
+    # Código para Alteração da Data de Desconto
+    change_discount_date_code_id = fields.Many2one(
+        comodel_name="l10n_br_cnab.code",
+        string="Change Discount Date Movement Instruction Code",
+        help="CNAB Movement Instruction Code for Change Discount Date.",
+        tracking=True,
+    )
+
     # Codigo para Protestar Título
     protest_title_code_id = fields.Many2one(
         comodel_name="l10n_br_cnab.code",

l10n_br_account_payment_order/models/l10n_br_cnab_change_methods.py

@@ -32,6 +32,9 @@ def _identify_cnab_change(
             if change_type == "change_date_maturity":
                 cnab_code = record._get_cnab_date_maturity(new_date)
                 record._make_cnab_change(cnab_code, new_payorder, payorder, reason)
+            elif change_type == "change_discount_date":
+                cnab_code = record._get_cnab_discount_date(new_date)
+                record._make_cnab_change(cnab_code, new_payorder, payorder, reason)
             elif change_type == "change_payment_mode":
                 record._change_payment_mode(reason, **kwargs)
             elif change_type == "baixa":
@@ -202,13 +205,13 @@ def _get_cnab_date_maturity(self, new_date):
         :return: deveria retornar algo ? Uma mensagem de confirmação talvez ?
         """
 
-        if new_date == self.date_maturity:
+        if new_date == self.date:
             raise UserError(
                 _(
                     "New Date Maturity %(new_date)s is equal to actual Date "
                     "Maturity %(date_maturity)s",
                     new_date=new_date,
-                    date_maturity=self.date_maturity,
+                    date_maturity=self.date,
                 )
             )
 
@@ -217,10 +220,35 @@ def _get_cnab_date_maturity(self, new_date):
         if not cnab_config.change_maturity_date_code_id:
             self._msg_error_cnab_missing(self.payment_mode_id, "Date Maturity Code")
 
-        self.date_maturity = new_date
+        self.date = new_date
 
         return cnab_config.change_maturity_date_code_id
 
+    def _get_cnab_discount_date(self, new_date):
+        """
+        CNAB - Instrução de Alteração da Data de Desconto.
+        :param new_date: nova data de desconto
+        :return: código CNAB de alteração da data de desconto
+        """
+
+        if new_date == self.date:
+            raise UserError(
+                _(
+                    "New Discount Date %(new_date)s is equal to current Discount "
+                    "Date %(date_discount)s",
+                    new_date=new_date,
+                    date_discount=self.date,
+                )
+            )
+
+        cnab_config = self.payment_mode_id.cnab_config_id
+        if not cnab_config.change_discount_date_code_id:
+            self._msg_error_cnab_missing(self.payment_mode_id, "Discount Date Code")
+
+        self.date = new_date
+
+        return cnab_config.change_discount_date_code_id
+
     def _create_cnab_not_payment(self, payorder, new_payorder, reason):
         """
         CNAB - Não Pagamento/Inadimplencia.

l10n_br_account_payment_order/tests/common.py

@@ -687,9 +687,9 @@ def _send_new_cnab_code(
 
                 if warning_error and test_dates_are_equals:
                     # Testa caso Sem Codigo
-                    new_date = aml_to_change.date_maturity
+                    new_date = aml_to_change.date
                 # Testa caso com Codigo e Data de Vencimento igual
-                f.date_maturity = new_date
+                f.date = new_date
             if code_to_send == "grant_rebate":
                 f.rebate_value = 10.00
             if code_to_send == "grant_discount":
@@ -732,7 +732,7 @@ def _send_new_cnab_instruction_code(
             if code_to_send == "change_date_maturity":
                 new_date = date.today() + relativedelta(years=1)
                 self.assertEqual(
-                    aml_to_change.date_maturity,
+                    aml_to_change.date,
                     new_date,
                     "Data não alterada",
                 )

l10n_br_account_payment_order/tests/tools.py

@@ -125,6 +125,10 @@ def create_with_form_l10n_br_cnab_config(env, values):
             cnab_config.change_maturity_date_code_id = values.get(
                 "change_maturity_date_code_id"
             )
+        if values.get("change_discount_date_code_id"):
+            cnab_config.change_discount_date_code_id = values.get(
+                "change_discount_date_code_id"
+            )
         if values.get("protest_title_code_id"):
             cnab_config.protest_title_code_id = values.get("protest_title_code_id")
         if values.get("suspend_protest_keep_wallet_code_id"):

l10n_br_account_payment_order/views/l10n_br_cnab_config_view.xml

@@ -261,7 +261,12 @@
                                         name="change_title_value_code_id"
                                         domain="['&', ('payment_method_ids', 'in', payment_method_id), ('bank_ids', 'in', bank_id), ('code_type', '=', 'instruction_move_code')]"
                                     />
-                                    <field
+                                <field
+                                        name="change_discount_date_code_id"
+                                        domain="['&amp;', ('payment_method_ids', 'in', payment_method_id),
+                                                ('bank_ids', 'in', bank_id), ('code_type', '=', 'instruction_move_code')]"
+                                    />
+                                <field
                                         name="change_maturity_date_code_id"
                                         domain="['&amp;', ('payment_method_ids', 'in', payment_method_id), ('bank_ids', 'in', bank_id), ('code_type', '=', 'instruction_move_code')]"
                                     />

l10n_br_account_payment_order/wizards/account_move_line_change.py

@@ -16,8 +16,8 @@ def default_get(self, fields_list):
             res["account_move_line_ids"] = [Command.set(active_ids)]
             if active_ids and len(active_ids) == 1:
                 move_line_id = self.account_move_line_ids.browse(active_ids)
-                if move_line_id.date_maturity:
-                    res["date_maturity"] = move_line_id.date_maturity
+                if move_line_id.date:
+                    res["date"] = move_line_id.date
                 if move_line_id.payment_mode_id:
                     res["payment_mode_id"] = move_line_id.payment_mode_id.id
         return res
@@ -30,6 +30,7 @@ def default_get(self, fields_list):
     # Muitas opções são permitidas, verificar manual do respectivo CNAB usado.
     change_type = fields.Selection(
         selection=[
+            ("change_discount_date", "Data de Desconto"),
             ("change_date_maturity", "Vencimento"),
             # TODO: É preciso mais detalhes dessa operação ao enviar fora o
             #  codigo de alteração e carteira o que mais deve ir ?
@@ -53,7 +54,7 @@ def default_get(self, fields_list):
         ],
         string="Tipo Alteração",
     )
-    date_maturity = fields.Date()
+    date = fields.Date()
     payment_mode_id = fields.Many2one(comodel_name="account.payment.mode")
     reason = fields.Text(string="Justificativa")
     rebate_value = fields.Float(string="Valor de Abatimento")
@@ -63,7 +64,7 @@ def doit(self):
         self.account_move_line_ids._identify_cnab_change(
             change_type=self.change_type,
             reason=self.reason,
-            new_date=self.date_maturity,
+            new_date=self.date,
             new_payment_mode_id=self.payment_mode_id,
             rebate_value=self.rebate_value,
             discount_value=self.discount_value,

l10n_br_account_payment_order/wizards/account_move_line_change.xml

@@ -13,8 +13,8 @@
                 <group>
                     <field name="change_type" widget="radio" />
                     <field
-                        name="date_maturity"
-                        attrs="{'invisible': [('change_type', '!=', 'change_date_maturity')], 'required': [('change_type', '=', 'change_date_maturity')]}"
+                        name="date"
+                        attrs="{'invisible': [('change_type', 'not in', ['change_date_maturity', 'change_discount_date'])]}"
                     />
                     <field
                         name="payment_mode_id"