From 96c06074e532c2437cae8cfb01b4501047b2778d Mon Sep 17 00:00:00 2001 From: sinergia Date: Tue, 6 Dec 2022 17:29:36 +0000 Subject: [PATCH] update optical equipment --- maintenance.py | 2 +- move.py | 4 +++- sale.xml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/maintenance.py b/maintenance.py index 3b49cb0..c91fbf3 100644 --- a/maintenance.py +++ b/maintenance.py @@ -216,7 +216,7 @@ class Maintenance(Workflow, ModelSQL, ModelView): service_maintenance = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service", ondelete='CASCADE', select=True, - domain=[('state', 'in', ['in_progress']), + domain=[('state', 'in', ['draft','in_progress']), ('propietary', '=', Eval('propietary'))], states=_states) code = fields.Char( diff --git a/move.py b/move.py index 62cd6b0..bf3ec40 100644 --- a/move.py +++ b/move.py @@ -120,7 +120,8 @@ class ShipmentOut(metaclass=PoolMeta): sale_origin=saleLine, maintenance_type='initial', propietary=shipment.customer.id, - propietary_address=shipment.delivery_address.id) + propietary_address=shipment.delivery_address.id, + state='draft') maintenanceService.save() serial = False @@ -137,6 +138,7 @@ class ShipmentOut(metaclass=PoolMeta): service_maintenance=maintenanceService.id, maintenance_type='initial', propietary=shipment.customer.id, + equipment_calibrate= True if move.equipment.product.calibration else False, propietary_address=shipment.delivery_address.id, equipment=move.equipment.id) maintenance.save() diff --git a/sale.xml b/sale.xml index 813885f..cf518a4 100644 --- a/sale.xml +++ b/sale.xml @@ -15,7 +15,7 @@ Sale Equipments sale.sale sale.sale - optical_equipment/report/Sale.fodt + optical_equipment/report/Sale_Internal.fodt @@ -27,7 +27,7 @@ Sale Equipments Internal sale.sale sale.sale - optical_equipment/report/Sale_Internal.fodt + optical_equipment/report/Sale.fodt