OneTeam/trytondo-optical_equipment
16
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

update optical equipment

Browse Source
This commit is contained in:
sinergia 2023-07-05 14:33:32 +00:00
parent 53a51aeb75
commit d69283f90e
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contract.py
View File

@ -159,7 +159,7 @@ class Contract(Workflow, ModelSQL, ModelView):
contract = contracts[0] contract = contracts[0]
for equipment in contract.current_equipments: for equipment in contract.current_equipments:
equipment.state = "uncontrated" equipment.state = "uncontrated"
equipment.contract_history1 += (contract.id,) equipment.contract_history += (contract.id,)
equipment.save() equipment.save()
contract.save() contract.save()
@ -180,7 +180,7 @@ class Contract(Workflow, ModelSQL, ModelView):
contract = contracts[0] contract = contracts[0]
for equipment in contract.current_equipments: for equipment in contract.current_equipments:
equipment.state = "contrated" equipment.state = "contrated"
equipment.contract_history1 += (contract.id,) equipment.contract_history += (contract.id,)
equipment.save() equipment.save()
cls.set_number(contracts) cls.set_number(contracts)
@ -192,7 +192,7 @@ class Contract(Workflow, ModelSQL, ModelView):
@Workflow.transition('cancelled') @Workflow.transition('cancelled')
def cancelled(cls, contracts): def cancelled(cls, contracts):
contract = contracts[0] contract = contracts[0]
for equipment in contract.equipments: for equipment in contract.current_equipments:
equipment.state = "uncontrated" equipment.state = "uncontrated"
equipment.save() equipment.save()
@ -357,7 +357,7 @@ class CreateContract(Wizard):
start_date=dates['start_date'], start_date=dates['start_date'],
end_date=dates['end_date'], end_date=dates['end_date'],
maintenance_services=prorogues, maintenance_services=prorogues,
equipments=equipments, current_equipments=equipments,
state='draft', state='draft',
price_contract=dates['unit_price'] price_contract=dates['unit_price']
) )

6
maintenance.py
View File

@ -236,8 +236,8 @@ class MaintenanceService(Workflow, ModelSQL, ModelView):
maintenance.save() maintenance.save()
except UserError: except UserError:
raise UserError(str('Validation Error')) raise UserError(str('Validation Error'))
else: else:
raise UserError(gettext('optical_equipment.msg_not_sequence_equipment')) raise UserError(gettext('optical_equipment.msg_not_sequence_equipment'))
@classmethod @classmethod
@ -298,7 +298,7 @@ class MaintenanceServiceLine(Workflow, ModelSQL, ModelView):
states=_states, states=_states,
domain=[('party', '=', Eval('propietary'))],) domain=[('party', '=', Eval('propietary'))],)
equipment = fields.Many2One('optical_equipment.equipment', "Equipment", equipment = fields.Many2One('optical_equipment.equipment', "Equipment",
domain=[('state', 'in', ['registred', 'uncontrated']), domain=[('state', 'in', ['registred', 'uncontrated', 'contrated']),
('propietary', '=', Eval('propietary')), ('propietary', '=', Eval('propietary')),
('propietary_address', '=', Eval('propietary_address'))], ('propietary_address', '=', Eval('propietary_address'))],
states=_states,) states=_states,)

6
move.py
View File

@ -35,7 +35,7 @@ class Move(metaclass=PoolMeta):
@classmethod @classmethod
def __setup__(cls): def __setup__(cls):
super(Move, cls).__setup__() super(Move, cls).__setup__()
cls.origin.states['required']=True cls.origin.states['required']=False
@fields.depends('product') @fields.depends('product')
def get_product_equipment(self, product): def get_product_equipment(self, product):
@ -159,7 +159,9 @@ class ShipmentOut(metaclass=PoolMeta):
serial = False serial = False
if number_equipments < 1 or maintenance_required < 1: if number_equipments < 1 or maintenance_required < 1:
raise UserError(str("No se generó un mantenimiento inicial dado que los equipos no requiren mantenimiento, ó no se encontró ningún producto de tipo equipo en este envío.")) shipment.service_maintenance_initial = True
shipment.save()
#raise UserError(str("No se generó un mantenimiento inicial dado que los equipos no requiren mantenimiento, ó no se encontró ningún producto de tipo equipo en este envío."))
break break
sale_origin = shipment.outgoing_moves[0].origin.sale sale_origin = shipment.outgoing_moves[0].origin.sale