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

[MERGE]:resolved conflicts and merged with trunk

Browse Source 
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
This commit is contained in:
Amit Patel (OpenERP)
2012-06-12 12:05:39 +05:30
parent a3ebc14784 b871639070
commit deec2bda0d
591 changed files with 11473 additions and 137547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/analytic_user_function/analytic_user_function_view.xml
+2 -2
View File
@@ -77,7 +77,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Information']/group/field[@name='account_id']" position="replace">
<xpath expr="//field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
</xpath>
</field>
@@ -89,7 +89,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/group/field[@name='user_id']" position="replace">
<xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>