odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] hr_expense, project: Change domain in expense to support regular contracts + modified the type of parent project analytic account in order to hide it in this new domain (and because it is more logical with this 'view' type) 

bzr revid: qdp-launchpad@openerp.com-20130322143746-75bofl6qmihvxru4
This commit is contained in:
Quentin (OpenERP) 2013-03-22 15:37:46 +01:00
parent 0094cebad9 c968142c03
commit a40577503f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_expense/hr_expense_view.xml
View File

@ -112,7 +112,7 @@
<field name="date_value" string="Expense Date"/>
<field name="name"/>
<field name="ref"/>
<field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
<field domain="[('type','in',['normal','contract'])]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
<field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>
<field name="unit_amount"/>
<field name="unit_quantity"/>

1
addons/project/project_data.xml
View File

@ -21,6 +21,7 @@
<record id="all_projects_account" model="account.analytic.account">
<field name="name">Projects</field>
<field name="code">3</field>
<field name="type">view</field>
</record>
<function id="parent_project_default_set" model="ir.values" name="set" eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)"/>