[MERGE] Merged from the main trunk addons

bzr revid: ach@tinyerp.com-20100917095950-y5z5zutx3xsax2c4
This commit is contained in:
Anup (OpenERP)
2010-09-17 15:29:50 +05:30
@@ -21,17 +21,7 @@
</field>
</record>
<record id="view_account_analytic_account_form" model="ir.ui.view">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="company_currency_id" position="replace">
<field name="currency_id"/>
</field>
</field>
</record>
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>