Merge branch '6.2' of https://gitea.onecluster.org/OneTeam/trytondo-optical_equipment into 6.2
This commit is contained in:
commit
9f352bbd63
@ -258,6 +258,18 @@
|
||||
<field name="model">optical_equipment.maintenance,-1</field>
|
||||
<field name="action" ref="report_calibration"/>
|
||||
</record>
|
||||
<record model="ir.action.report" id="report_capacitation">
|
||||
<field name="name">Capacitation</field>
|
||||
<field name="model">optical_equipment_maintenance.service</field>
|
||||
<field name="report_name">optical_equipment_maintenance.service</field>
|
||||
<field name="report">report/certificado_capacitacion.odt</field>
|
||||
<field name="single" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.action.keyword" id="report_capacitation_keyword">
|
||||
<field name="keyword">form_print</field>
|
||||
<field name="model">optical_equipment_maintenance.service,-1</field>
|
||||
<field name="action" ref="report_capacitation"/>
|
||||
</record>
|
||||
<menuitem parent="menu_diary"
|
||||
action="act_maintenance_diary_calendar"
|
||||
sequence="10"
|
||||
|
@ -253,13 +253,12 @@ class Template(metaclass=PoolMeta):
|
||||
def default_voltageDC():
|
||||
return 0
|
||||
|
||||
@staticmethod
|
||||
def default_voltageDC_uom():
|
||||
@fields.depends('voltageDC', 'voltageDC_uom')
|
||||
def on_change_voltageDC_uom(self):
|
||||
pool = Pool()
|
||||
Measurements = pool.get('product.uom')
|
||||
measurement = Measurements.search(['name', '=', 'Volt'])[0].id
|
||||
|
||||
return measurement
|
||||
self.voltageDC_uom = measurement
|
||||
|
||||
|
||||
@staticmethod
|
||||
|
@ -22,7 +22,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<field name="name">Purchase</field>
|
||||
<field name="model">purchase.purchase</field>
|
||||
<field name="report_name">purchase.purchase</field>
|
||||
<field name="report">report/Compras.odt</field>
|
||||
<field name="report">report/compras.fodt</field>
|
||||
<field name="single" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.action.keyword" id="report_purchase_keyword">
|
||||
|
10
sale.py
10
sale.py
@ -23,11 +23,15 @@ class Sale(metaclass=PoolMeta):
|
||||
('equipments', 'Equipments'),
|
||||
('replaces', 'Replaces')], "Sale Type", required=True,
|
||||
states={'readonly': Eval('state') != 'draft'})
|
||||
maintenance_type = fields.Selection([('preventive', 'Preventive'),
|
||||
maintenance_type = fields.Selection([('', ""),
|
||||
('preventive', 'Preventive'),
|
||||
('corrective', 'Corrective')
|
||||
], "Maintenance Type", states={'invisible': Eval('sale_type') != "maintenance",
|
||||
], "Maintenance Type",
|
||||
states={
|
||||
'invisible': Eval('sale_type') != "maintenance",
|
||||
'required': Eval('sale_type') == "maintenance",
|
||||
'readonly': Eval('state') != 'draft'})
|
||||
'readonly': Eval('state') != 'draft'},
|
||||
depends=['sale_type'])
|
||||
|
||||
contract_ref = fields.Reference("Contract Base", selection='get_origin_contract',
|
||||
domain=[('party', '=', Eval('party')),
|
||||
|
39
sale.xml
39
sale.xml
@ -6,37 +6,16 @@
|
||||
<field name="inherit" ref="sale.sale_view_form"/>
|
||||
<field name="name">sale_form</field>
|
||||
</record>
|
||||
<!--
|
||||
<record model="ir.ui.view" id="sale_line_view_form">
|
||||
<field name="model">sale.line</field>
|
||||
<field name="inherit" ref="sale.sale_line_view_form"/>
|
||||
<field name="name">sale_line_form</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="sale_line_view_tree">
|
||||
<field name="model">sale.line</field>
|
||||
<field name="inherit" ref="sale.sale_line_view_tree"/>
|
||||
<field name="name">sale_line_tree</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="sale_line_view_tree_sequence">
|
||||
<field name="model">sale.line</field>
|
||||
<field name="inherit" ref="sale.sale_line_view_tree_sequence"/>
|
||||
<field name="name">sale_line_tree_sequence</field>
|
||||
</record>
|
||||
-->
|
||||
<!--
|
||||
<record model="ir.ui.view" id="create_subscription_view_form">
|
||||
<field name="model">sale.create.subscription.start</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">create_subscription_form</field>
|
||||
</record>
|
||||
<record model="ir.action.wizard" id="create_subscription">
|
||||
<field name="name">Subscription</field>
|
||||
<field name="wiz_name">sale.create.subscription</field>
|
||||
<record model="ir.action.report" id="report_sale">
|
||||
<field name="name">Sale Equipments</field>
|
||||
<field name="model">sale.sale</field>
|
||||
<field name="report_name">sale.sale</field>
|
||||
<field name="report">report/venta.fodt</field>
|
||||
<field name="single" eval="True"/>
|
||||
</record>
|
||||
<record model="ir.action.keyword" id="create_subscription_keyword">
|
||||
<field name="keyword">form_action</field>
|
||||
<record model="ir.action.keyword" id="report_sale_keyword">
|
||||
<field name="keyword">form_print</field>
|
||||
<field name="model">sale.sale,-1</field>
|
||||
<field name="action" ref="create_subscription"/>
|
||||
</record>-->
|
||||
<field name="action" ref="report_sale"/>
|
||||
</record>
|
||||
</tryton>
|
||||
|
Loading…
Reference in New Issue
Block a user