Merge PR #3282 into 14.0

Signed-off-by rvalyi
OCA · Aug 15, 2024 · e33bc2c · e33bc2c
2 parents 02dd890 + 099772c
commit e33bc2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/l10n_br_purchase_stock/models/purchase_order.py b/l10n_br_purchase_stock/models/purchase_order.py
@@ -42,7 +42,8 @@ def _compute_get_button_create_invoice_invisible(self):
     @api.model
     def _prepare_picking(self):
         values = super()._prepare_picking()
-        values.update(self._prepare_br_fiscal_dict())
+        if self.fiscal_operation_id:
+            values.update(self._prepare_br_fiscal_dict())
         if self.company_id.purchase_create_invoice_policy == "stock_picking":
             values["invoice_state"] = "2binvoiced"
 

diff --git a/l10n_br_purchase_stock/models/purchase_order_line.py b/l10n_br_purchase_stock/models/purchase_order_line.py
@@ -15,8 +15,9 @@ def _prepare_stock_moves(self, picking):
         """
         values = super()._prepare_stock_moves(picking)
         for v in values:
-            v.update(self._prepare_br_fiscal_dict())
-            if self.env.company.purchase_create_invoice_policy == "stock_picking":
+            if self.order_id.fiscal_operation_id:
+                v.update(self._prepare_br_fiscal_dict())
+            if self.order_id.purchase_create_invoice_policy == "stock_picking":
                 v["invoice_state"] = "2binvoiced"
         return values