pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Improvement in HR wizard and demo

Browse Source 
bzr revid: rpa@tinyerp.com-20110729095859-irhfpol62jxkrc75
This commit is contained in:
Rucha (Open ERP)
2011-07-29 15:28:59 +05:30
parent 5434985b37 fd361f326e
commit 7f32676f1b
5 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/hr_expense_demo.xml
+4 -4
View File
@@ -27,13 +27,13 @@
</record>
<record id="product_product_expense_car" model="product.product">
<field name="list_price">0.30</field>
<field name="standard_price">0.30</field>
<field name="list_price">0.32</field>
<field name="standard_price">0.32</field>
<field name="uom_id" ref="product.product_uom_km"/>
<field name="uom_po_id" ref="product.product_uom_km"/>
<field name="type">consu</field>
<field name="name">Car Travel</field>
<field name="default_code">CAR</field>
<field name="name">Travel Expenses</field>
<field name="default_code">TRA</field>
<field name="categ_id" ref="product.cat2"/>
<field name="hr_expense_ok" eval="True" />
</record>
addons/hr_expense/hr_expense_installer_view.xml
+18 -2
View File
@@ -1,14 +1,30 @@
<?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 editable="bottom" 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="domain">[('hr_expense_ok','=',True)]</field>
<field name="view_id" ref="product_expense_installer_tree_view"/>
</record>
<record id="product_normal_form_view_todo" model="ir.actions.todo">
addons/hr_recruitment/hr_recruitment_view.xml
+1 -1
View File
@@ -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"/>
addons/hr_timesheet_invoice/__openerp__.py
-1
View File
@@ -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',
addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
-42
View File
@@ -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&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=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>