[IMP]hr_expense,hr_recruitment:Remove a configure your services and improve Config Review Your Expenses
bzr revid: mma@tinyerp.com-20110726133255-jhx0zwcisp2ql3h3
This commit is contained in:
parent
fbbebc5273
commit
1e5fc17c9d
|
@ -1,14 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record model="ir.actions.act_window" id="product_normal_form_view_installer">
|
||||
<record id="product_expense_installer_tree_view" model="ir.ui.view">
|
||||
<field name="name">product.product.tree</field>
|
||||
<field name="model">product.product</field>
|
||||
<field name="type">tree</field>
|
||||
<field eval="7" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Products">
|
||||
<field name="name"/>
|
||||
<field name="standard_price"/>
|
||||
<field name="list_price"/>
|
||||
<field name="uom_id" string="UoM"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="product_normal_form_view_installer">
|
||||
<field name="name">Review Your Expenses Products</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.product</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
|
||||
<field name="view_id" ref="product.product_normal_form_view"/>
|
||||
<field name="view_id" ref="product_expense_installer_tree_view"/>
|
||||
</record>
|
||||
|
||||
<record id="product_normal_form_view_todo" model="ir.actions.todo">
|
||||
|
|
|
@ -330,7 +330,7 @@
|
|||
<group colspan="4" col="6">
|
||||
<separator string="Stage Definition" colspan="6"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="department_id"/>
|
||||
<field name="department_id" groups="base.group_extended"/>
|
||||
<field name="sequence"/>
|
||||
</group>
|
||||
<separator string="Requirements" colspan="4"/>
|
||||
|
|
|
@ -47,7 +47,6 @@ reports, etc.""",
|
|||
'wizard/hr_timesheet_invoice_create_view.xml',
|
||||
'wizard/hr_timesheet_invoice_create_final_view.xml',
|
||||
'board_hr_timesheet_invoice.xml',
|
||||
'hr_timesheet_invoice_installer_view.xml'
|
||||
],
|
||||
'demo': [
|
||||
'hr_timesheet_invoice_demo.xml',
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- Configure Your Services Config Wiz -->
|
||||
|
||||
<record id="product_timesheet_invoice_tree_view" model="ir.ui.view">
|
||||
<field name="name">product.product.tree</field>
|
||||
<field name="model">product.product</field>
|
||||
<field name="type">tree</field>
|
||||
<field eval="7" name="priority"/>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="red:virtual_available<0;blue:virtual_available>=0 and state in ('draft', 'end', 'obsolete');black:virtual_available>=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
|
||||
<field name="name"/>
|
||||
<field name="standard_price"/>
|
||||
<field name="lst_price"/>
|
||||
<field name="uom_id" string="UoM"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="product_services_form_view_installer">
|
||||
<field name="name">Configure Your Services</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">product.product</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('type','=','service')]</field>
|
||||
<field name="context" eval="'{\'default_type\':\'service\', \'default_sale_ok\':True, \'default_hr_expense_ok\':False,}'"/>
|
||||
<field name="view_id" ref="product_timesheet_invoice_tree_view"/>
|
||||
</record>
|
||||
|
||||
<record id="product_services_form_view_todo" model="ir.actions.todo">
|
||||
<field name="action_id" ref="product_services_form_view_installer"/>
|
||||
<field name="category_id" ref="hr.category_hr_management_config"/>
|
||||
<field name="sequence">3</field>
|
||||
<field name="type">normal</field>
|
||||
<field name="state">skip</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
Loading…
Reference in New Issue