Merge PR #1953 into 14.0

Signed-off-by rvalyi
OCA · Sep 24, 2022 · 210899d · 210899d
2 parents 1038ea0 + cc3c19f
commit 210899d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/l10n_br_account_payment_order/models/account_payment_line.py b/l10n_br_account_payment_order/models/account_payment_line.py
@@ -89,7 +89,6 @@ class AccountPaymentLine(models.Model):
 
     payment_mode_id = fields.Many2one(
         comodel_name="account.payment.mode",
-        tracking=True,
     )
 
     # Campo não usado no BRCobranca

diff --git a/l10n_br_account_payment_order/models/account_payment_mode.py b/l10n_br_account_payment_order/models/account_payment_mode.py
@@ -15,9 +15,9 @@ class AccountPaymentMode(models.Model):
     _name = "account.payment.mode"
     _inherit = [
         "account.payment.mode",
-        "mail.thread",
         "l10n_br_cnab.boleto.fields",
         "l10n_br_cnab.payment.fields",
+        "mail.thread",
     ]
 
     auto_create_payment_order = fields.Boolean(

diff --git a/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py b/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py
@@ -7,8 +7,9 @@
 from ..constants import BOLETO_ESPECIE
 
 
-class L10nBrCNABBoletoFields(models.Model):
+class L10nBrCNABBoletoFields(models.AbstractModel):
     _name = "l10n_br_cnab.boleto.fields"
+    _inherit = "mail.thread"
     _description = "CNAB - Boleto Fields."
 
     invoice_print = fields.Boolean(string="Gerar relatorio na conclusão da fatura?")

diff --git a/l10n_br_account_payment_order/models/l10n_br_cnab_mov_intruction_code.py b/l10n_br_account_payment_order/models/l10n_br_cnab_mov_intruction_code.py
@@ -7,7 +7,7 @@
 
 class L10nBrCNABMovInstructionCode(models.Model):
     _name = "l10n_br_cnab.mov.instruction.code"
-    _inherit = "l10n_br_cnab.data.abstract"
+    _inherit = ["l10n_br_cnab.data.abstract", "mail.thread"]
     _description = "CNAB Movement Instruction Code"
 
     bank_ids = fields.Many2many(

diff --git a/l10n_br_account_payment_order/models/l10n_br_cnab_payment_fields.py b/l10n_br_account_payment_order/models/l10n_br_cnab_payment_fields.py
@@ -11,7 +11,7 @@
 )
 
 
-class L10nBrCNABPaymentFields(models.Model):
+class L10nBrCNABPaymentFields(models.AbstractModel):
     _name = "l10n_br_cnab.payment.fields"
     _description = "CNAB - Payment Fields."
 

diff --git a/l10n_br_account_payment_order/models/l10n_br_cnab_return_move_code.py b/l10n_br_account_payment_order/models/l10n_br_cnab_return_move_code.py
@@ -7,7 +7,7 @@
 
 class L10nBrCNABReturnMoveCode(models.Model):
     _name = "l10n_br_cnab.return.move.code"
-    _inherit = "l10n_br_cnab.data.abstract"
+    _inherit = ["l10n_br_cnab.data.abstract", "mail.thread"]
     _description = "CNAB Return Move Code"
 
     bank_ids = fields.Many2many(