audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #464 into 12.0

Browse Source 
Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2020-02-06 13:47:15 +00:00
parent abfe97a998 fca7246819
commit c200bcb6f8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mrp_multi_level/models/product_mrp_area.py
View File

@@ -34,6 +34,7 @@ class ProductMRPArea(models.Model):
readonly=True,
related='product_id.product_tmpl_id',
store=True,
compute_sudo=True,
)
location_id = fields.Many2one(
related="mrp_area_id.location_id",
@@ -75,11 +76,11 @@ class ProductMRPArea(models.Model):
main_supplier_id = fields.Many2one(
comodel_name='res.partner', string='Main Supplier',
compute='_compute_main_supplier', store=True,
index=True,
index=True, compute_sudo=True,
)
main_supplierinfo_id = fields.Many2one(
comodel_name='product.supplierinfo', string='Supplier Info',
compute='_compute_main_supplier', store=True,
compute='_compute_main_supplier', store=True, compute_sudo=True,
)
supply_method = fields.Selection(
selection=[('buy', 'Buy'),
@@ -169,7 +170,9 @@ class ProductMRPArea(models.Model):
"""Simplified and similar to procurement.rule logic."""
for rec in self.filtered(lambda r: r.supply_method == 'buy'):
suppliers = rec.product_id.seller_ids.filtered(
lambda r: (not r.product_id or r.product_id == rec.product_id))
lambda r: (not r.product_id or r.product_id == rec.product_id)
and (not r.company_id or r.company_id == rec.company_id)
)
if not suppliers:
continue
rec.main_supplierinfo_id = suppliers[0]

2
mrp_multi_level/views/mrp_inventory_views.xml
View File

@@ -87,10 +87,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="MRP Inventory">
<field name="company_id" groups="base.group_multi_company"/>
<group name="select" expand="0" string="Selection...">
<field name="product_id"/>
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<separator/>
<filter string="To Procure" name="filter_to_procure"