cambios finales

contract.py

@@ -62,7 +62,8 @@ class Contract(Workflow, ModelSQL, ModelView):
                            })
     maintenance_services = fields.Many2Many('optical_equipment_maintenance.service-equipment.contract',
                                             'contract', 'maintenance_services', "Prorogues")
-    equipments = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment', 'contract', 'equipment')
+    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([
@@ -123,6 +124,7 @@ class Contract(Workflow, ModelSQL, ModelView):
         contract = contracts[0]
         for equipment in contract.equipments:
             equipment.state = "contrated"
+            equipment.contract_history += (contract.id,)
             equipment.save()
 
         cls.set_number(contracts)

equipment.py

@@ -43,7 +43,7 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                               ('contrated', "Contrated")
                               ], "State",
                              required=True, readonly=True, sort=False)
-
+    contract = fields.Many2One('optical_equipment.contract', "Contract", ondelete='CASCADE')
     company = fields.Many2One('company.company', "Company", readonly=True)
     location = fields.Many2One('stock.location', "Location",
                                states=_states,)
@@ -96,12 +96,6 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
     health_register = fields.Char("Health Register", size=None,
                                   states=_states,)
     contract_history = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment', 'equipment','contract', "Contracts", states={'readonly': True})
-    #subscription_history = fields.Many2Many('sale.subscription-optical_equipment.equipment',
-    #                    'equipment','subscription', "Subscriptions",
-    #                    states={'readonly': True})
-    #contract_history = fields.Many2Many('optical_equipment.contract-optical_equipment.equipment',
-    #                                    'equipment', 'contract')
- 
     maintenance_history = fields.Function(
         fields.Many2Many('optical_equipment.maintenance-optical_equipment.equipment',
                          'equipment', 'maintenance',"Maintenances"), 'get_maintenances_of_equipment')
@@ -109,14 +103,11 @@ class OpticalEquipment(DeactivableMixin, Workflow, ModelSQL, ModelView):
                                    states=_states,)
 
     maintenance_frequency = fields.Selection(_MAINTENANCE_FREQUENCY, "Maintenance Frequency",
-                                             depends=['propietary']
-                                             )
+                                             depends=['propietary'])
     purchase_origin = fields.Reference("Purchase Origin", selection='get_origin',select=True,
-                                       states={'readonly': True}
-                                       )
+                                       states={'readonly': True})
     sale_destination = fields.Reference("Sale Destination", selection='get_destination',select=True,
-                                       states={'readonly': True}
-                                        )
+                                       states={'readonly': True})
     shipment_destination =  fields.Reference("Stock Move", selection='get_shipment', select=True,
                                              states={'readonly': True})
     rec_name = fields.Function(fields.Char("rec_name"), 'get_rec_name')
@@ -360,6 +351,8 @@ class NewPropietary(Wizard):
         new_propietary = self.start.new_propietary
         new_address = self.start.new_address
 
+        equipment.propietarys += (equipment.propietary,)
         equipment.propietary = new_propietary
         equipment.propietary_address = new_address
+        equipment.maintenance_frequency = "6" if new_propietary.client_type == 'ips' else "12"
         equipment.save()

locale/es.po

@@ -282,6 +282,10 @@ msgctxt "field:optical_equipment.equipment,purchase_origin:"
 msgid "Purchase Origin"
 msgstr "Origen de la Compra"
 
+msgctxt "field:optical_equipment.equipment,propietary:"
+msgid "Propietary"
+msgstr "Propietarios"
+
 msgctxt "view:optical_equipment.equipment:"
 msgid "Contracts"
 msgstr "Contratos"
@@ -1234,3 +1238,19 @@ msgstr "Fecha Final"
 msgctxt "field:stock.move,equipment:"
 msgid "Equipment"
 msgstr "Equipo"
+
+msgctxt "field:optical_equipment.change_propietary.form,equipment:"
+msgid "Equipment"
+msgstr "Equipo"
+
+msgctxt "field:optical_equipment.change_propietary.form,new_propietary:"
+msgid "New Propietary"
+msgstr "Nuevo Propietario"
+
+msgctxt "field:optical_equipment.change_propietary.form,new_address:"
+msgid "New Address"
+msgstr "Nueva Dirección"
+
+msgctxt "field:optical_equipment.change_propietary.form,change_date:"
+msgid "Change Date"
+msgstr "Fecha de Cambio"

move.py

@@ -108,6 +108,7 @@ class ShipmentOut(metaclass=PoolMeta):
                     equipment.state="uncontrated"
                     equipment.shipment_destination = shipment
                     equipment.sale_destination = shipment.outgoing_moves[count].origin
+                    equipment.propietarys += (shipment.customer,)
                     equipment.maintenance_frequency = "6" if shipment.customer.client_type == "ips" else "12"
                     count+=1
                     equipment.save()