pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] purchase,purchase_stock: use correct company on PO creation

Browse Source 
The picking_type and currency were taken from the current company, even if the
purchase order is created in another company.

Fixes #35026

closes odoo/odoo#64481

X-original-commit: 75936208c6e76a012027952f43b598e9d20180f3
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
This commit is contained in:
Victor Feyens
2021-01-13 13:43:33 +00:00
parent b30648198a
commit ca16c531a9
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/models/purchase.py
+5 -3
View File
@@ -200,13 +200,15 @@ class PurchaseOrder(models.Model):
@api.model
def create(self, vals):
company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
# Ensures default picking type and currency are taken from the right company.
self_comp = self.with_company(company_id)
if vals.get('name', 'New') == 'New':
company_id = vals.get("company_id", self.env.company.id)
seq_date = None
if 'date_order' in vals:
seq_date = fields.Datetime.context_timestamp(self, fields.Datetime.to_datetime(vals['date_order']))
vals['name'] = self.env['ir.sequence'].with_company(company_id).next_by_code('purchase.order', sequence_date=seq_date) or '/'
return super(PurchaseOrder, self).create(vals)
vals['name'] = self_comp.env['ir.sequence'].next_by_code('purchase.order', sequence_date=seq_date) or '/'
return super(PurchaseOrder, self_comp).create(vals)
@api.ondelete(at_uninstall=False)
def _unlink_if_cancelled(self):
addons/purchase_stock/tests/test_purchase_order.py
+19 -1
View File
@@ -212,7 +212,7 @@ class TestPurchaseOrder(ValuationReconciliationTestCommon):
self.assertEqual(po1.order_line.qty_received, 5)
self.assertEqual(po1.picking_ids[-1].move_lines.product_qty, 10)
def test_update_date_planned(self):
def test_04_update_date_planned(self):
today = datetime.today().replace(hour=9, microsecond=0)
tomorrow = datetime.today().replace(hour=9, microsecond=0) + timedelta(days=1)
po = self.env['purchase.order'].create(self.po_vals)
@@ -245,3 +245,21 @@ class TestPurchaseOrder(ValuationReconciliationTestCommon):
'<p> partner_a modified receipt dates for the following products:</p><p> \xa0 - Large Desk from %s to %s </p><p> \xa0 - Conference Chair from %s to %s </p><p>Those dates couldn’t be modified accordingly on the receipt %s which had already been validated.</p>' % (today.date(), tomorrow.date(), today.date(), tomorrow.date(), po.picking_ids.name),
activity.note,
)
def test_05_multi_company(self):
company_a = self.env.user.company_id
company_b = self.env['res.company'].create({
"name": "Test Company",
"currency_id": self.env['res.currency'].with_context(active_test=False).search([
('id', '!=', company_a.currency_id.id),
], limit=1).id
})
self.env.user.write({
'company_id': company_b.id,
'company_ids': [(4, company_b.id), (4, company_a.id)],
})
po = self.env['purchase.order'].create(dict(company_id=company_a.id, partner_id=self.partner_a.id))
self.assertEqual(po.company_id, company_a)
self.assertEqual(po.picking_type_id.warehouse_id.company_id, company_a)
self.assertEqual(po.currency_id, po.company_id.currency_id)