diff --git a/cert.py b/cert.py deleted file mode 100644 index e69de29..0000000 diff --git a/configuration_equipment.py b/configuration_equipment.py index a9e40dd..73bc944 100644 --- a/configuration_equipment.py +++ b/configuration_equipment.py @@ -6,7 +6,6 @@ class Configuration(ModelSingleton, ModelSQL, ModelView): 'Equipment Configuration' __name__='optical_equipment.configuration' - equipment_sequence = fields.Many2One('ir.sequence', "Equipment Sequence", domain=[('sequence_type', '=', Id('optical_equipment', 'sequence_type_equipment')) ]) diff --git a/contract.py b/contract.py index 5340197..e9325ba 100644 --- a/contract.py +++ b/contract.py @@ -63,7 +63,6 @@ class Contract(Workflow, ModelSQL, ModelView): maintenance_services = fields.Many2Many('optical_equipment_maintenance.service-equipment.contract', 'contract', 'maintenance_services', "Prorogues") equipments = fields.One2Many('optical_equipment.equipment', 'contract', "Equipments") - #equipments = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment', 'contract', 'equipment') price_contract = Monetary("Price Contract", digits=price_digits, currency='currency', required=True, states={'readonly': Eval('state') != 'draft'}) state = fields.Selection([ @@ -138,13 +137,13 @@ class Contract(Workflow, ModelSQL, ModelView): pass - class ContractMaintenanceServices(ModelSQL): 'Contract - Maintenance Services' __name__ = 'optical_equipment_maintenance.service-equipment.contract' maintenance_services = fields.Many2One('optical_equipment_maintenance.service', "Maintenance Service", select=True) contract = fields.Many2One('optical_equipment.contract', "Contract") + class ContractEquipment(ModelSQL): 'Optical Equipment - Contract' diff --git a/contract.xml b/contract.xml index 6dbac98..bcb073d 100644 --- a/contract.xml +++ b/contract.xml @@ -56,35 +56,6 @@ - running Run @@ -137,18 +108,6 @@ name="Contracts Management" sequence="50" id="menu_contracts"/> - form calibration_total_form - optical_equipment_maintenance.agended form @@ -283,12 +260,6 @@ optical_equipment.maintenance,-1 - - -
-