Merge pull request #499 from frePPLe/18.0

Syncing from upstream frePPLe/odoo (18.0)

frepple/__manifest__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     "name": "frepple",
-    "version": "18.0.0.0",
+    "version": "18.0.0.1",
     "category": "Manufacturing",
     "summary": "Advanced planning and scheduling",
     "author": "frePPLe",

frepple/controllers/inbound.py

@@ -90,6 +90,7 @@ def run(self):
             stck_picking_type = self.env["stock.picking.type"].with_user(
                 self.actual_user
             )
+            bom_type = self.env["mrp.bom"].with_user(self.actual_user)
             stck_picking = self.env["stock.picking"].with_user(self.actual_user)
             stck_move = self.env["stock.move"].with_user(self.actual_user)
             stck_warehouse = self.env["stock.warehouse"].with_user(self.actual_user)
@@ -706,6 +707,19 @@ def run(self):
                                 remark = "frePPLe - %s" % remark
                             else:
                                 remark = "frePPLe"
+                            bom_id = int(elem.get("operation").rsplit(" ", 1)[1])
+                            try:
+                                bom = bom_type.search(
+                                    [
+                                        ("id", "=", bom_id),
+                                    ],
+                                    limit=1,
+                                )
+                                if not bom and bom.type == "phantom":
+                                    # Avoid creating MO on a) non-existing BOMs and b) phantom/kit BOMs
+                                    continue
+                            except Exception:
+                                pass
                             mo = mfg_order.with_context(context).create(
                                 {
                                     "product_qty": elem.get("quantity"),
@@ -715,9 +729,7 @@ def run(self):
                                     "company_id": self.company.id,
                                     "product_uom_id": int(uom_id),
                                     "picking_type_id": picking.id,
-                                    "bom_id": int(
-                                        elem.get("operation").rsplit(" ", 1)[1]
-                                    ),
+                                    "bom_id": bom_id,
                                     "qty_producing": 0.00,
                                     # TODO no place to store the criticality
                                     # elem.get('criticality'),

frepple/controllers/outbound.py

@@ -1418,20 +1418,20 @@ def export_boms(self):
                                 quoteattr(location),
                             )
                         else:
-                            duration_per = (i["produce_delay"] or 0) + (
+                            duration = (i["produce_delay"] or 0) + (
                                 i["days_to_prepare_mo"] or 0
                             )
 
-                            yield '<operation name=%s %ssize_multiple="1" duration_per="%s" posttime="P%dD" priority="%s" xsi:type="operation_time_per">\n' "<item name=%s/><location name=%s/>\n" % (
+                            yield '<operation name=%s %ssize_multiple="1" duration="%s" posttime="P%dD" priority="%s" xsi:type="operation_fixed_time">\n' "<item name=%s/><location name=%s/>\n" % (
                                 quoteattr(operation),
                                 (
                                     ("description=%s " % quoteattr(i["code"]))
                                     if i["code"]
                                     else ""
                                 ),
                                 (
-                                    self.convert_float_time(duration_per)
-                                    if duration_per and duration_per > 0
+                                    self.convert_float_time(duration)
+                                    if duration and duration > 0
                                     else "P0D"
                                 ),
                                 self.manufacturing_lead,
@@ -2370,6 +2370,7 @@ def export_manufacturingorders(self):
         ):
             # Filter out irrelevant manufacturing orders
             location = self.map_locations.get(i.location_dest_id.id, None)
+            operation = i.name
             if not location and i.picking_type_id:
                 # For subcontracting MO we find the warehouse on the operation type
                 operation_type = self.operation_types.get(i.picking_type_id.id, None)
@@ -2378,7 +2379,7 @@ def export_manufacturingorders(self):
                     if location:
                         code = self.subcontracting_mo_po_mapping.get(i.id, None)
                         if code:
-                            i.name = code
+                            operation = code
             item = self.product_product.get(i.product_id.id, None)
             if not item or not location:
                 continue
@@ -2388,14 +2389,16 @@ def export_manufacturingorders(self):
             # materials.
             # To reflect this flexibility we need a frepple operation specific
             # to each manufacturing order.
-            operation = i.name
             try:
                 startdate = self.formatDateTime(
                     i.date_start if i.date_start else i.date_planned_start
                 )
-                # enddate = self.formatDateTime(i.date_planned_finished)
             except Exception:
                 continue
+            try:
+                enddate = self.formatDateTime(i.date_finished)
+            except Exception:
+                enddate = None
             qty = self.convert_qty_uom(
                 i.qty_producing if i.qty_producing else i.product_qty,
                 i.product_uom_id.id,
@@ -2415,40 +2418,33 @@ def export_manufacturingorders(self):
                 batch = mto_mo[0].display_name if mto_mo else i.name
 
             # Create a record for the MO
-            # Option 1: compute MO end date based on the start date
-            yield '<operationplan type="MO" reference=%s batch=%s start="%s" quantity="%s" status="%s">\n' % (
+            yield '<operationplan type="MO" reference=%s batch=%s %s="%s" quantity="%s" status="%s">\n' % (
                 quoteattr(i.name),
                 quoteattr(batch),
-                startdate,
+                (
+                    "start"  # Option 1: compute MO end date based on the start date
+                    if self.manage_work_orders or not enddate
+                    else "end"  # Option 2: compute MO start date based on the end date
+                ),
+                (startdate if self.manage_work_orders or not enddate else enddate),
                 qty,
-                "approved",  # In the "approved" status, frepple can still reschedule the MO in function of material and capacity
-                # "confirmed",  # In the "confirmed" status, frepple sees the MO as frozen and unchangeable
-                # "approved" if i["status"]  == "confirmed" else "confirmed", # In-progress can't be rescheduled in frepple, but confirmed MOs
+                # In the "approved" status, frepple can still reschedule the MO in function of material and capacity
+                # In the "confirmed" status, frepple sees the MO as frozen and unchangeable
+                (
+                    "approved"
+                    if self.manage_work_orders or i.state in ("confirmed", "draft")
+                    else "confirmed"
+                ),
             )
-            # Option 2: compute MO start date based on the end date
-            # yield '<operationplan type="MO" reference=%s end="%s" quantity="%s" status="%s"><operation name=%s/><flowplans>\n' % (
-            #     quoteattr(i["name"]),
-            #     enddate,
-            #     qty,
-            #     # "approved",  # In the "approved" status, frepple can still reschedule the MO in function of material and capacity
-            #     "confirmed",  # In the "confirmed" status, frepple sees the MO as frozen and unchangeable
-            #     quoteattr(operation),
-            # )
-
-            # Collect work order info
-            if self.manage_work_orders:
-                wo_list = i.workorder_ids
-            else:
-                wo_list = []
 
             # Collect move info
             if i.move_raw_ids:
                 mv_list = i.move_raw_ids
             else:
                 mv_list = []
 
-            if not wo_list:
-                # There are no workorders on the manufacturing order
+            if not self.manage_work_orders or not getattr(i, "workorder_ids", None):
+                # There are no workorders on the manufacturing order (or we don't want to see them in frepple)
                 yield '<operation name=%s xsi:type="operation_fixed_time" priority="0"><location name=%s/><item name=%s/><flows>' % (
                     quoteattr(operation),
                     quoteattr(location),
@@ -2488,7 +2484,37 @@ def export_manufacturingorders(self):
                 yield '<flow xsi:type="flow_end" quantity="1"><item name=%s/></flow>\n' % (
                     quoteattr(item["name"]),
                 )
-                yield "</flows></operation></operationplan>"
+                yield "</flows>"
+                # Pick up work center loading of all work orders
+                loads = {}
+                for wo in getattr(i, "workorder_ids", []):
+                    # Get remaining duration of the WO
+                    time_left = wo.duration_expected - wo.duration_unit
+                    if wo.is_user_working and wo.time_ids:
+                        # The WO is currently being worked on
+                        for tm in wo.time_ids:
+                            if tm.date_start and not tm.date_end:
+                                time_left -= round(
+                                    (now - tm.date_start).total_seconds() / 60
+                                )
+                    if (
+                        time_left > 0
+                        and wo.workcenter_id.id in self.map_workcenters
+                        and wo.state not in ("done", "cancel")
+                    ):
+                        loads[self.map_workcenters[wo.workcenter_id.id]] = (
+                            loads.get(self.map_workcenters[wo.workcenter_id.id], 0)
+                            + time_left
+                        )
+                if loads:
+                    yield "<loads>"
+                    for r, q in loads.items():
+                        yield '<load quantity_fixed="%s" quantity="0"><resource name=%s/></load>' % (
+                            q,
+                            quoteattr(r),
+                        )
+                    yield "</loads>"
+                yield "</operation></operationplan>"
             else:
                 # Define an operation for the MO
                 yield '<operation name=%s xsi:type="operation_routing" priority="0"><item name=%s/><location name=%s/><suboperations>' % (
@@ -2499,7 +2525,7 @@ def export_manufacturingorders(self):
                 # Define operations for each WO
                 idx = 10
                 first_wo = True
-                for wo in wo_list:
+                for wo in i.workorder_ids:
                     suboperation = wo.display_name
                     if len(suboperation) > 300:
                         suboperation = suboperation[0:300]
@@ -2624,7 +2650,7 @@ def export_manufacturingorders(self):
 
                 # Create operationplans for each WO, starting with the last one
                 idx = 0
-                for wo in reversed(wo_list):
+                for wo in reversed(i.workorder_ids):
                     idx += 1.0
                     suboperation = wo.display_name
                     if len(suboperation) > 300:

frepple/migrations/18.0.0.1/pre-migrate.py

@@ -0,0 +1,11 @@
+from odoo import SUPERUSER_ID, api
+
+
+def migrate(cr, version):
+    """Update xml id of roles which have"""
+    if not version:
+        return
+    # Can not change form to list on existing database. So delete the form views before upgrading the module
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    env["ir.ui.view"].search([('arch_fs', 'ilike', 'frepple/'), ('type', '=', 'form')]).unlink()
+

frepple/views/mrp_routing_workcenter_inherit.xml

@@ -32,7 +32,7 @@
         <field name="arch" type="xml">
             <notebook position="inside">
                 <page string="Secondary Workcenters" name="Secondary Workcenters">
-                    <field name="secondary_workcenter" context="{'routing_workcenter_id_invisible': True, 'default_routing_workcenter_id': id, 'tree_view_ref': 'mrp.mrp_secondary_workcenter_tree_view'}"/>
+                    <field name="secondary_workcenter" context="{'routing_workcenter_id_invisible': True, 'default_routing_workcenter_id': id, 'list_view_ref': 'frepple.mrp_secondary_workcenter_tree_view'}"/>
                 </page>
             </notebook>
         </field>

frepple/views/mrp_secondary_workcenter.xml

@@ -4,14 +4,14 @@
         <field name="name">mrp.secondary.workcenter.tree</field>
         <field name="model">mrp.secondary.workcenter</field>
         <field name="arch" type="xml">
-            <form string="Secondary Work Centers">
+            <list string="Secondary Work Centers">
                 <field name="routing_workcenter_id" invisible="1"/>
                 <field name="workcenter_id"/>
                 <field name="skill"/>
                 <field name="search_mode" optional="show"/>
                 <field name="priority" optional="show"/>
                 <field name="duration"/>
-            </form>
+            </list>
         </field>
     </record>
     <record id="mrp_secondary_workcenter_form_view" model="ir.ui.view">
@@ -32,4 +32,4 @@
             </form>
         </field>
     </record>
-</odoo>
+</odoo>

frepple/views/mrp_skill.xml

@@ -4,7 +4,7 @@
         <field name="name">Skill</field>
         <field name="res_model">mrp.skill</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem name="Skills" id="skill_menu" parent="mrp.menu_mrp_configuration"
         action="mrp_skill_action" sequence="100" groups="base.group_user" />
@@ -26,10 +26,10 @@
         <field name="name">MRP Skill List</field>
         <field name="model">mrp.skill</field>
         <field name="arch" type="xml">
-            <form>
+            <list>
                 <field name="name" />
                 <field name="description" />
-            </form>
+            </list>
         </field>
     </record>
-</odoo>
+</odoo>

frepple/views/mrp_workcenter_inherit.xml

@@ -32,9 +32,9 @@
         <field name="arch" type="xml">
             <notebook position="inside">
                 <page string="Skills" name="Skills">
-                    <field name="workcenter_skill_ids" context="{'workcenter_invisible': True, 'default_workcenter_id': id, 'tree_view_ref': 'mrp.mrp_workcenter_skill_view_tree'}"/>
+                    <field name="workcenter_skill_ids" context="{'workcenter_invisible': True, 'default_workcenter_id': id, 'list_view_ref': 'frepple.mrp_workcenter_skill_view_tree'}"/>
                 </page>
             </notebook>
         </field>
     </record>
-</odoo>
+</odoo>

frepple/views/mrp_workcenter_skill.xml

@@ -4,7 +4,7 @@
         <field name="name">Work Center Skill</field>
         <field name="res_model">mrp.workcenter.skill</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem name="Work Center Skill" id="workcenter_skill_menu" parent="mrp.menu_mrp_configuration" action="mrp_workcenter_skill_action" sequence="110" groups="base.group_user" />
     <record id="mrp_workcenter_skill_view_form" model="ir.ui.view">
@@ -26,11 +26,11 @@
         <field name="name">MRP Work Center Skill List</field>
         <field name="model">mrp.workcenter.skill</field>
         <field name="arch" type="xml">
-            <form>
+            <list>
                 <field name="workcenter" invisible="context.get('workcenter_invisible', False)"/>
                 <field name="skill" />
                 <field name="priority" />
-            </form>
+            </list>
         </field>
     </record>
-</odoo>
+</odoo>

frepple/views/mrp_workorder_secondary_workcenter.xml

@@ -5,11 +5,11 @@
         <field name="name">mrp.workorder.secondary.workcenter.tree</field>
         <field name="model">mrp.workorder.secondary.workcenter</field>
         <field name="arch" type="xml">
-            <form>
+            <list>
                 <field name="workorder_id" invisible="1"/>
                 <field name="workcenter_id"/>
                 <field name="duration"/>
-            </form>
+            </list>
         </field>
     </record>
     <record id="mrp_workorder_secondary_workcenter_form_view" model="ir.ui.view">
@@ -18,7 +18,7 @@
         <field name="arch" type="xml">
             <form string="Secondary Work Centers">
                 <sheet>
-                    <group name="Secondary workcenter" context="{'tree_view_ref': 'mrp.mrp_workorder_secondary_workcenter_tree_view'}">
+                    <group name="Secondary workcenter" context="{'list_view_ref': 'frepple.mrp_workorder_secondary_workcenter_tree_view'}">
                         <field name="workorder_id" invisible="1"/>
                         <field name="workcenter_id"/>
                         <field name="duration"/>
@@ -27,4 +27,4 @@
             </form>
         </field>
     </record>
-</odoo>
+</odoo>

frepple/views/product_supplierinfo_inherit.xml

@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>     
-<odoo>        
-
-
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="product_supplierinfo_inherit_tree_view" model="ir.ui.view">
         <field name="name">product.supplierinfo.inherit.tree.view</field>
@@ -14,5 +11,3 @@
         </field>
     </record>
 </odoo>
-
-</odoo>