diff options
Diffstat (limited to 'addons/purchase/models/purchase.py')
| -rw-r--r-- | addons/purchase/models/purchase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index f068dbf9af1..994142c7362 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -1050,11 +1050,11 @@ class ProcurementRule(models.Model): def _prepare_purchase_order(self, product_id, product_qty, product_uom, origin, values, partner): schedule_date = self._get_purchase_schedule_date(values) purchase_date = self._get_purchase_order_date(product_id, product_qty, product_uom, values, partner, schedule_date) - fpos = self.env['account.fiscal.position'].with_context(company_id=values['company_id'].id).get_fiscal_position(partner.id) + fpos = self.env['account.fiscal.position'].with_context(force_company=values['company_id'].id).get_fiscal_position(partner.id) gpo = self.group_propagation_option group = (gpo == 'fixed' and self.group_id.id) or \ - (gpo == 'propagate' and values['group_id'].id) or False + (gpo == 'propagate' and 'group_id' in values and values['group_id'].id) or False return { 'partner_id': partner.id, @@ -1079,7 +1079,7 @@ class ProcurementRule(models.Model): domain = super(ProcurementRule, self)._make_po_get_domain(values, partner) gpo = self.group_propagation_option group = (gpo == 'fixed' and self.group_id) or \ - (gpo == 'propagate' and values['group_id']) or False + (gpo == 'propagate' and 'group_id' in values and values['group_id']) or False domain += ( ('partner_id', '=', partner.id), |