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 #1172 into 14.0

Browse Source 
Signed-off-by ivantodorovich
This commit is contained in:
OCA-git-bot
2023-12-28 11:34:42 +00:00
parent c5e3c8a02e 7f1a6b95b9
commit 7f3d62146a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mrp_bom_attribute_match/models/mrp_bom.py
View File

@@ -160,6 +160,18 @@ class MrpBomLine(models.Model):
if self.bom_product_template_attribute_value_ids: if self.bom_product_template_attribute_value_ids:
self._check_variants_validity() self._check_variants_validity()
def _skip_bom_line(self, product):
# Make this method compatible to work with NewIds
res = super()._skip_bom_line(product)
return res and (
len(
set(product.product_template_attribute_value_ids.ids)
& set(self.bom_product_template_attribute_value_ids.ids)
)
!= len(self.bom_product_template_attribute_value_ids.attribute_id)
)
class MrpBom(models.Model): class MrpBom(models.Model):
_inherit = "mrp.bom" _inherit = "mrp.bom"

3
mrp_bom_attribute_match/reports/mrp_report_bom_structure.py
View File

@@ -32,9 +32,6 @@ class ReportBomStructure(models.AbstractModel):
if to_ignore_line_ids: if to_ignore_line_ids:
for to_ignore_line_id in to_ignore_line_ids: for to_ignore_line_id in to_ignore_line_ids:
bom.bom_line_ids = [(3, to_ignore_line_id, 0)] bom.bom_line_ids = [(3, to_ignore_line_id, 0)]
product = bom._get_component_template_product(
line, product, line.product_id
)
components, total = super()._get_bom_lines( components, total = super()._get_bom_lines(
bom, bom_quantity, product, line_id, level bom, bom_quantity, product, line_id, level
) )