entry of serial and button registred
This commit is contained in:
parent
af32d1c9fb
commit
35a5d217ac
@ -14,6 +14,7 @@ def register():
|
|||||||
sale.SaleLine,
|
sale.SaleLine,
|
||||||
sale.CreateSubscriptionStart,
|
sale.CreateSubscriptionStart,
|
||||||
equipment.OpticalEquipment,
|
equipment.OpticalEquipment,
|
||||||
|
equipment.EquipmentMaintenance,
|
||||||
configuration_equipment.Configuration,
|
configuration_equipment.Configuration,
|
||||||
maintenance.Maintenance,
|
maintenance.Maintenance,
|
||||||
maintenance.MaintenanceActivity,
|
maintenance.MaintenanceActivity,
|
||||||
|
22
equipment.py
22
equipment.py
@ -87,6 +87,9 @@ class OpticalEquipment(Workflow, ModelSQL, ModelView):
|
|||||||
'equipment','subscription', "Subscriptions",
|
'equipment','subscription', "Subscriptions",
|
||||||
states={'readonly': True}
|
states={'readonly': True}
|
||||||
)
|
)
|
||||||
|
maintenance_history = fields.Many2Many('optical_equipment.maintenance-optical_equipment.equipment', 'equipment', 'maintenance', "Maintenances",
|
||||||
|
states={'readonly': True}
|
||||||
|
)
|
||||||
software_version = fields.Char("Software version", size=None,
|
software_version = fields.Char("Software version", size=None,
|
||||||
states=_states,)
|
states=_states,)
|
||||||
|
|
||||||
@ -194,4 +197,21 @@ class OpticalEquipment(Workflow, ModelSQL, ModelView):
|
|||||||
@ModelView.button
|
@ModelView.button
|
||||||
@Workflow.transition('registred')
|
@Workflow.transition('registred')
|
||||||
def registred(cls, equipments):
|
def registred(cls, equipments):
|
||||||
cls.set_code(equipments)
|
#raise UserError(str(equipments[0].serial))
|
||||||
|
for i in equipments:
|
||||||
|
if i.serial == None:
|
||||||
|
raise UserError(str(i.serial))
|
||||||
|
else:
|
||||||
|
cls.set_code(equipments)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class EquipmentMaintenance(ModelSQL):
|
||||||
|
'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)
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +60,8 @@ class Purchase(metaclass=PoolMeta):
|
|||||||
refurbish=line.refurbish,
|
refurbish=line.refurbish,
|
||||||
serial=None if line.quantity > 1 else line.serial_equipment,
|
serial=None if line.quantity > 1 else line.serial_equipment,
|
||||||
health_register=line.health_register,
|
health_register=line.health_register,
|
||||||
software_version=line.software_version)
|
software_version=line.software_version,
|
||||||
|
maintenance_frequency="none")
|
||||||
equipment.save()
|
equipment.save()
|
||||||
else:
|
else:
|
||||||
continue
|
continue
|
||||||
|
@ -1,55 +1,61 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||||
this repository contains the full copyright notices and license terms. -->
|
this repository contains the full copyright notices and license terms. -->
|
||||||
<form>
|
<form col="6">
|
||||||
<label name="code"/>
|
<label name="code"/>
|
||||||
<field name="code"/>
|
<field name="code"/>
|
||||||
<label name="company"/>
|
<label name="company"/>
|
||||||
<field name="company"/>
|
<field name="company"/>
|
||||||
|
<newline/>
|
||||||
<label name="propietary"/>
|
<label name="propietary"/>
|
||||||
<field name="propietary"/>
|
<field name="propietary"/>
|
||||||
<label name="propietary_address"/>
|
<label name="propietary_address"/>
|
||||||
<field name="propietary_address"/>
|
<field name="propietary_address"/>
|
||||||
<label name="location"/>
|
<notebook colspan="6">
|
||||||
<field name="location"/>
|
<page string="General" id="general_equipment">
|
||||||
<label name="product"/>
|
<label name="location"/>
|
||||||
<field name="product"/>
|
<field name="location"/>
|
||||||
<label name="equipment_type"/>
|
<label name="product"/>
|
||||||
<field name="equipment_type"/>
|
<field name="product"/>
|
||||||
<label name="use"/>
|
<label name="equipment_type"/>
|
||||||
<field name="use"/>
|
<field name="equipment_type"/>
|
||||||
<label name="biomedical_class"/>
|
<label name="use"/>
|
||||||
<field name="biomedical_class"/>
|
<field name="use"/>
|
||||||
<label name="calibration"/>
|
<label name="biomedical_class"/>
|
||||||
<field name="calibration"/>
|
<field name="biomedical_class"/>
|
||||||
<newline/>
|
<label name="calibration"/>
|
||||||
<label name="mark_category"/>
|
<field name="calibration"/>
|
||||||
<field name="mark_category"/>
|
<newline/>
|
||||||
<label name="model_category"/>
|
<label name="mark_category"/>
|
||||||
<field name="model_category"/>
|
<field name="mark_category"/>
|
||||||
<label name="reference_category"/>
|
<label name="model_category"/>
|
||||||
<field name="reference_category"/>
|
<field name="model_category"/>
|
||||||
<label name="refurbish"/>
|
<label name="reference_category"/>
|
||||||
<field name="refurbish"/>
|
<field name="reference_category"/>
|
||||||
<label name="software_version"/>
|
<label name="refurbish"/>
|
||||||
<field name="software_version"/>
|
<field name="refurbish"/>
|
||||||
<label name="useful_life"/>
|
<label name="software_version"/>
|
||||||
<field name="useful_life"/>
|
<field name="software_version"/>
|
||||||
<label name="warranty"/>
|
<label name="useful_life"/>
|
||||||
<field name="warranty"/>
|
<field name="useful_life"/>
|
||||||
<newline/>
|
<label name="warranty"/>
|
||||||
<label name="maintenance_frequency"/>
|
<field name="warranty"/>
|
||||||
<field name="maintenance_frequency"/>
|
<newline/>
|
||||||
<label name="serial"/>
|
<label name="maintenance_frequency"/>
|
||||||
<field name="serial"/>
|
<field name="maintenance_frequency"/>
|
||||||
<label name="health_register"/>
|
<label name="serial"/>
|
||||||
<field name="health_register"/>
|
<field name="serial"/>
|
||||||
<label name="origin_country"/>
|
<label name="health_register"/>
|
||||||
<field name="origin_country"/>
|
<field name="health_register"/>
|
||||||
<notebook>
|
<label name="origin_country"/>
|
||||||
|
<field name="origin_country"/>
|
||||||
|
</page>
|
||||||
<page string="Subscriptions" id="subscriptions_equipment">
|
<page string="Subscriptions" id="subscriptions_equipment">
|
||||||
<field name="subscription_history"/>
|
<field name="subscription_history"/>
|
||||||
</page>
|
</page>
|
||||||
|
<page string="Maintenances" id="maintenances_equipment">
|
||||||
|
<field name="maintenance_history"/>
|
||||||
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
<group col="2" colspan="2" id="button">
|
<group col="2" colspan="2" id="button">
|
||||||
<button name="draft"/>
|
<button name="draft"/>
|
||||||
|
@ -11,4 +11,6 @@
|
|||||||
<field name="product"/>
|
<field name="product"/>
|
||||||
<field name="equipment_type"/>
|
<field name="equipment_type"/>
|
||||||
<field name="serial" expand="1"/>
|
<field name="serial" expand="1"/>
|
||||||
|
<button name="registred"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user