diff --git a/equipment.py b/equipment.py
index 0ef06c4..0551d00 100644
--- a/equipment.py
+++ b/equipment.py
@@ -87,9 +87,9 @@ class OpticalEquipment(Workflow, ModelSQL, ModelView):
'equipment','subscription', "Subscriptions",
states={'readonly': True}
)
- maintenance_history = fields.Many2Many('optical_equipment.maintenance-optical_equipment.equipment', 'equipment', 'maintenance', "Maintenances",
- states={'readonly': True}
- )
+ maintenance_history = fields.Function(
+ fields.Many2Many('optical_equipment.maintenance-optical_equipment.equipment',
+ 'equipment', 'maintenance',"Maintenances"), 'get_maintenances_of_equipment')
software_version = fields.Char("Software version", size=None,
states=_states,)
@@ -129,7 +129,17 @@ class OpticalEquipment(Workflow, ModelSQL, ModelView):
raise UserError(str('Validation Error'))
else:
raise UserError(gettext('optical_equipment.msg_not_sequence_equipment'))
-
+
+
+
+ def get_maintenances_of_equipment(self, records):
+ raise UserError(str(self))
+ pool = Pool()
+ MaintenancesEquipment = pool.get('optical_equipment.maintenance')
+ maintenancesEquipment = set()
+
+ pass
+
@classmethod
def default_state(cls):
return 'draft'
@@ -206,12 +216,9 @@ class OpticalEquipment(Workflow, ModelSQL, ModelView):
-class EquipmentMaintenance(ModelSQL):
+class EquipmentMaintenance(ModelSQL, ModelView):
'Optical Equipment - Equipment - Maintenance'
__name__='optical_equipment.maintenance-optical_equipment.equipment'
- maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenances', select=True)
-
equipment = fields.Many2One('optical_equipment.equipment', 'Equipment', select=True)
-
-
+ maintenance = fields.Many2One('optical_equipment.maintenance', 'Maintenances', select=True)
diff --git a/maintenance.xml b/maintenance.xml
index 4888185..75794b0 100644
--- a/maintenance.xml
+++ b/maintenance.xml
@@ -13,11 +13,16 @@
tree
maintenance_tree
-
+
optical_equipment.maintenance
form
maintenance_form
+
+ optical_equipment.maintenance-optical_equipment.equipment
+
+ maintenance_equipment_form
+
diff --git a/view/maintenance_form.xml b/view/maintenance_form.xml
index 66f4993..d5d8cc8 100644
--- a/view/maintenance_form.xml
+++ b/view/maintenance_form.xml
@@ -14,7 +14,6 @@
-