diff --git a/__init__.py b/__init__.py index 2264d7e..f73f9dd 100644 --- a/__init__.py +++ b/__init__.py @@ -16,6 +16,7 @@ def register(): equipment.EquipmentMaintenance, equipment.EquipmentParty, equipment.ChangePropietary, + equipment.ChangeEquipment, configuration_equipment.Configuration, maintenance.Calibration, maintenance.CreateContractInitial, diff --git a/equipment.py b/equipment.py index 80c90c5..0283525 100644 --- a/equipment.py +++ b/equipment.py @@ -324,7 +324,9 @@ class ChangePropietary(ModelView): 'Change of Propietary Equipment' __name__ = 'optical_equipment.change_propietary.form' - equipment = fields.Many2One('optical_equipment.equipment', "Equipment") + old_propietary = fields.Many2One('party.party', 'Old Propietary') + equipments = fields.Many2Many('optical_equipment.equipment-change_propietary.form', 'equipment', 'change', "Equipments") + #equipment = fields.Many2One('optical_equipment.equipment', "Equipment") new_propietary = fields.Many2One('party.party', "New Propietary") new_address = fields.Many2One('party.address', "New Address", required=True, domain=[('party', '=', Eval('new_propietary'))],) @@ -358,3 +360,11 @@ class NewPropietary(Wizard): equipment.propietary_address = new_address equipment.maintenance_frequency = "6" if new_propietary.client_type == 'ips' else "12" equipment.save() + + +class ChangeEquipment(ModelSQL): + 'Change Equipment' + __name__ = 'optical_equipment.equipment-change_propietary.form' + + equipment = fields.Many2One('optical_equipment.equipment', 'Equipment') + change = fields.Many2One('optical_equipment.change_propietary.form', 'Change') diff --git a/view/change_propietary_form.xml b/view/change_propietary_form.xml index 38bdae7..53232c3 100644 --- a/view/change_propietary_form.xml +++ b/view/change_propietary_form.xml @@ -2,8 +2,10 @@
-