diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index 6db598119a5..1b213b65b69 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -110,11 +110,6 @@ class MrpProduction(models.Model): help="Informative date allowing to define when the manufacturing order should be processed at the latest to fulfill delivery on time.") date_start = fields.Datetime('Start Date', copy=False, index=True, readonly=True) date_finished = fields.Datetime('End Date', copy=False, index=True, readonly=True) - date_start_wo = fields.Datetime( - 'Plan From', copy=False, readonly=True, - help="Work orders will be planned based on the availability of the work centers\ - starting from this date. If empty, the work orders will be planned as soon as possible.", - ) bom_id = fields.Many2one( 'mrp.bom', 'Bill of Material', readonly=True, states={'draft': [('readonly', False)]}, @@ -721,7 +716,7 @@ class MrpProduction(models.Model): return True def _get_start_date(self): - return self.date_start_wo or datetime.datetime.now() + return self.date_planned_start or datetime.datetime.now() def _plan_workorders(self, replan=False): """ Plan all the production's workorders depending on the workcenters diff --git a/addons/mrp/tests/test_workorder_operation.py b/addons/mrp/tests/test_workorder_operation.py index 1fda2bd5fe0..908c3b3e2e6 100644 --- a/addons/mrp/tests/test_workorder_operation.py +++ b/addons/mrp/tests/test_workorder_operation.py @@ -1011,7 +1011,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): production_table_form.bom_id = self.mrp_bom_desk production_table_form.product_qty = 1.0 production_table_form.product_uom_id = dining_table.uom_id - production_table_form.date_start_wo = date_start + production_table_form.date_planned_start = date_start production_table = production_table_form.save() production_table.action_confirm() @@ -1075,7 +1075,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = planned_date + mo_form.date_planned_start = planned_date mo = mo_form.save() mo.action_confirm() mo.button_plan() @@ -1093,7 +1093,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = planned_date + mo_form.date_planned_start = planned_date mo = mo_form.save() mo.action_confirm() mo.button_plan() @@ -1154,9 +1154,9 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = datetime(2019, 5, 13, 14, 0, 0, 0) + mo_form.date_planned_start = datetime(2019, 5, 13, 14, 0, 0, 0) mo = mo_form.save() - start = mo.date_start_wo + start = mo.date_planned_start mo.action_confirm() mo.button_plan() self.assertEqual(mo.workorder_ids[0].workcenter_id, self.wc_alt_2, "wrong workcenter") @@ -1170,7 +1170,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = datetime(2019, 5, 13, 9, 0, 0, 0) + mo_form.date_planned_start = datetime(2019, 5, 13, 9, 0, 0, 0) mo = mo_form.save() mo.action_confirm() mo.button_plan() @@ -1236,7 +1236,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = datetime(2019, 5, 13, 9, 0, 0, 0) + mo_form.date_planned_start = datetime(2019, 5, 13, 9, 0, 0, 0) mo = mo_form.save() mo.action_confirm() mo.button_plan() @@ -1253,7 +1253,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = datetime(2019, 5, 13, 9, 0, 0, 0) + mo_form.date_planned_start = datetime(2019, 5, 13, 9, 0, 0, 0) mo = mo_form.save() mo.action_confirm() mo.button_plan() @@ -1292,7 +1292,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom mo_form.product_qty = 1 - mo_form.date_start_wo = planned_date + mo_form.date_planned_start = planned_date mo = mo_form.save() mo.action_confirm() # Plans the MO and checks the date. diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 82be7ee590d..8fe96b9a71a 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -116,30 +116,22 @@ -