Merge PR #3198 into 16.0

Signed-off-by rvalyi
OCA · Aug 26, 2024 · fc8250e · fc8250e
2 parents aa559ff + bb69404
commit fc8250e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/l10n_br_fiscal/models/document.py b/l10n_br_fiscal/models/document.py
@@ -72,26 +72,13 @@ class Document(models.Model):
         store=True,
     )
 
-    document_number = fields.Char(
-        copy=False,
-        index=True,
-        unaccent=False,
-    )
-
     rps_number = fields.Char(
         string="RPS Number",
         copy=False,
         index=True,
         unaccent=False,
     )
 
-    document_key = fields.Char(
-        string="Key",
-        copy=False,
-        index=True,
-        unaccent=False,
-    )
-
     document_date = fields.Datetime(
         copy=False,
     )
@@ -103,10 +90,6 @@ class Document(models.Model):
         default=lambda self: self.env.user,
     )
 
-    document_type_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.type",
-    )
-
     operation_name = fields.Char(
         copy=False,
     )
@@ -122,15 +105,6 @@ class Document(models.Model):
         copy=False,
     )
 
-    document_serie_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.serie",
-        domain="[('active', '=', True)," "('document_type_id', '=', document_type_id)]",
-    )
-
-    document_serie = fields.Char(
-        string="Serie Number",
-    )
-
     document_related_ids = fields.One2many(
         comodel_name="l10n_br_fiscal.document.related",
         inverse_name="document_id",

diff --git a/l10n_br_fiscal/models/document_fiscal_mixin_fields.py b/l10n_br_fiscal/models/document_fiscal_mixin_fields.py
@@ -443,3 +443,29 @@ def _operation_domain(self):
     )
 
     force_compute_delivery_costs_by_total = fields.Boolean(default=False)
+
+    document_type_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.document.type",
+    )
+
+    document_serie_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.document.serie",
+        domain="[('active', '=', True)," "('document_type_id', '=', document_type_id)]",
+    )
+
+    document_serie = fields.Char(
+        string="Serie Number",
+    )
+
+    document_number = fields.Char(
+        copy=False,
+        index=True,
+        unaccent=False,
+    )
+
+    document_key = fields.Char(
+        string="Key",
+        copy=False,
+        index=True,
+        unaccent=False,
+    )