mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-11-02 20:30:20 -06:00
[PATCH] Upstream patch - 27052023
This commit is contained in:
1 parent
50acfc7a79
commit
2a5f774eb0
14 files changed
+125
-63
No files matched your search
@@ -120,12 +120,6 @@ class StockMove(models.Model):
|
||||
for move in self:
|
||||
move.order_finished_lot_ids = move.raw_material_production_id.lot_producing_id
|
||||
|
||||
@api.model
|
||||
def _prepare_merge_moves_distinct_fields(self):
|
||||
distinct_fields = super()._prepare_merge_moves_distinct_fields()
|
||||
distinct_fields.append('bom_line_id')
|
||||
return distinct_fields
|
||||
|
||||
@api.depends('raw_material_production_id.bom_id')
|
||||
def _compute_allowed_operation_ids(self):
|
||||
for move in self:
|
||||
@@ -380,7 +374,8 @@ class StockMove(models.Model):
|
||||
def _prepare_merge_moves_distinct_fields(self):
|
||||
distinct_fields = super()._prepare_merge_moves_distinct_fields()
|
||||
distinct_fields.append('created_production_id')
|
||||
distinct_fields.append('bom_line_id')
|
||||
if self.bom_line_id and ("phantom" in self.bom_line_id.bom_id.mapped('type')):
|
||||
distinct_fields.append('bom_line_id')
|
||||
return distinct_fields
|
||||
|
||||
@api.model
|
||||
|
||||
Reference in new issue
Block a user