[FIX] eliminates force_company

ingadhoc · Aug 8, 2022 · 1722ef6 · 1722ef6
1 parent 9af345d
commit 1722ef6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/sale_order_type_ux/models/sale_order.py b/sale_order_type_ux/models/sale_order.py
@@ -49,13 +49,12 @@ def _prepare_invoice(self):
             return super()._prepare_invoice()
         res = super()._prepare_invoice()
         company = self.type_id.journal_id.company_id
-        self = self.with_context(force_company=company.id)
+        self = self.with_company(company.id)
         if company != self.company_id:
             res['company_id'] = company.id
             res['invoice_partner_bank_id'] = company.partner_id.bank_ids[:1].id
             so_fiscal_position = self.env['account.fiscal.position'].browse(res['fiscal_position_id'])
             if so_fiscal_position.company_id and so_fiscal_position.company_id != company:
-                res['fiscal_position_id'] = self.env['account.fiscal.position'].with_context(
-                    force_company=company.id).get_fiscal_position(
-                    self.partner_invoice_id.id, self.partner_shipping_id.id)
+                res['fiscal_position_id'] = self.env['account.fiscal.position'].with_company(
+                    company.id).get_fiscal_position(self.partner_invoice_id.id)
         return res
diff --git a/sale_order_type_ux/wizards/sale_advance_payment_inv.py b/sale_order_type_ux/wizards/sale_advance_payment_inv.py
@@ -15,7 +15,7 @@ def _prepare_invoice_values(self, order, name, amount, so_line):
         if not order.type_id.journal_id:
             return super()._prepare_invoice_values(order, name, amount, so_line)
         company = order.type_id.journal_id.company_id
-        self = self.with_context(force_company=company.id)
+        self = self.with_company(company.id)
         res = super()._prepare_invoice_values(order, name, amount, so_line)
         if company != order.company_id.id:
             taxes = self.product_id.taxes_id.filtered(