diff --git a/so_bom_selection/__manifest__.py b/so_bom_selection/__manifest__.py index 382d8b01c..338c70c36 100644 --- a/so_bom_selection/__manifest__.py +++ b/so_bom_selection/__manifest__.py @@ -21,7 +21,7 @@ ################################################################################ { 'name': "Bill Of Material from Sale Order Line", - 'version': '18.0.1.0.0', + 'version': '18.0.1.0.1', 'category': 'Manufacturing', 'summary': 'Select the BOM in sale order line and generate the ' 'manufacturing order of components', diff --git a/so_bom_selection/doc/RELEASE_NOTES.md b/so_bom_selection/doc/RELEASE_NOTES.md index 90d9777d4..7385c147d 100644 --- a/so_bom_selection/doc/RELEASE_NOTES.md +++ b/so_bom_selection/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 18.0.1.0.0 #### ADD - Initial commit for Bill Of Material from Sale Order Line + +#### 20.02.2025 +#### Version 18.0.1.0.1 +#### UPT +- Update in the Confirm button action and Write function for Bill Of Material from Sale Order Line to fix the issue of creating two MOs \ No newline at end of file diff --git a/so_bom_selection/models/sale_order.py b/so_bom_selection/models/sale_order.py index 88c269526..7ed38de8e 100644 --- a/so_bom_selection/models/sale_order.py +++ b/so_bom_selection/models/sale_order.py @@ -29,35 +29,45 @@ class SaleOrder(models.Model): def action_confirm(self): """ Create manufacturing order of components in selected BOM """ for rec in self.order_line: - if rec.bom_id and rec.bom_id.type != 'phantom' and rec.bom_id.type != 'subcontract': - mo = self.env["mrp.production"].create( - { - "product_id": rec.product_id.id, - "product_uom_id": rec.product_id.uom_id.id, - "origin": self.name, - 'company_id': self.env.user.company_id.id, - "product_qty": rec.product_uom_qty, - "qty_to_produce": rec.product_uom_qty, - "bom_id": rec.bom_id.id, - "sale_line_id": rec.id, - } - ) - moves_raw_values = mo._get_moves_raw_values() - list_move_raw = [] - for move_raw_values in moves_raw_values: - list_move_raw += [(0, 0, move_raw_values)] - return super().action_confirm() + if rec.bom_id and rec.bom_id in rec.product_template_id.bom_ids: + # Store the original sequence order + original_sequences = {bom.id: bom.sequence for bom in rec.product_template_id.bom_ids} + # Set the selected BOM's sequence to 0 + rec.bom_id.sequence = 0 + # Get all other BOMs and update their sequence accordingly + other_boms = rec.product_template_id.bom_ids - rec.bom_id + sequence_counter = 1 # Start sequence from 1 for others + for bom in other_boms.sorted('sequence'): + bom.sequence = sequence_counter + sequence_counter += 1 + result = super().action_confirm() + # Restore original sequences after the confirmation + for rec in self.order_line: + if rec.bom_id and rec.bom_id in rec.product_template_id.bom_ids: + for bom in rec.product_template_id.bom_ids: + if bom.id in original_sequences: + bom.sequence = original_sequences[bom.id] + manufacturing_order = self.env["mrp.production"].search( + [('origin', '=', self.name), + ('state', '=', 'confirmed')]) + if manufacturing_order: + for mo in manufacturing_order: + print(mo.product_qty) + mo.update({'qty_to_produce': mo.product_qty}) + # mo.update({'state':'draft'}) + return result def write(self, values): - """Super write method to change the manufacturing quantity - based on sale order quantity""" + """Super write method to change the qty_to_produce in the MO + based on sale order quantity""" res = super().write(values) for order_line in self.order_line: if order_line.product_uom_qty: - mo = self.env["mrp.production"].search( - [('sale_line_id', '=', order_line.id), - ('state', '=', 'draft')]) - if mo: - mo.write({'product_qty': order_line.product_uom_qty}) - mo.write({'qty_to_produce': order_line.product_uom_qty}) + manufacturing_order = self.env["mrp.production"].search( + [('origin', '=', self.name), + ('state', '=', 'confirmed')]) + if manufacturing_order: + for mo in manufacturing_order: + mo.write({'qty_to_produce': mo.product_qty}) return res + diff --git a/so_bom_selection/static/description/assets/screenshots/1.png b/so_bom_selection/static/description/assets/screenshots/1.png index 099acc07c..e95ac28df 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/1.png and b/so_bom_selection/static/description/assets/screenshots/1.png differ diff --git a/so_bom_selection/static/description/assets/screenshots/2.png b/so_bom_selection/static/description/assets/screenshots/2.png index 0aa55bfc7..c4e67e9af 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/2.png and b/so_bom_selection/static/description/assets/screenshots/2.png differ diff --git a/so_bom_selection/static/description/assets/screenshots/3.png b/so_bom_selection/static/description/assets/screenshots/3.png index a23e58e6a..eef3c876b 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/3.png and b/so_bom_selection/static/description/assets/screenshots/3.png differ diff --git a/so_bom_selection/static/description/assets/screenshots/4.png b/so_bom_selection/static/description/assets/screenshots/4.png index d9c61a250..2f557ad5e 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/4.png and b/so_bom_selection/static/description/assets/screenshots/4.png differ diff --git a/so_bom_selection/static/description/assets/screenshots/5.png b/so_bom_selection/static/description/assets/screenshots/5.png index 7618375d0..fa3ee1d10 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/5.png and b/so_bom_selection/static/description/assets/screenshots/5.png differ diff --git a/so_bom_selection/static/description/assets/screenshots/6.png b/so_bom_selection/static/description/assets/screenshots/6.png index 29ee26e45..1a7a3d9d2 100644 Binary files a/so_bom_selection/static/description/assets/screenshots/6.png and b/so_bom_selection/static/description/assets/screenshots/6.png differ diff --git a/so_bom_selection/static/description/index.html b/so_bom_selection/static/description/index.html index cc7533fe3..961b4327e 100644 --- a/so_bom_selection/static/description/index.html +++ b/so_bom_selection/static/description/index.html @@ -462,7 +462,8 @@
-

Manufacturing Order created for components with source as corresponding Sale Order