[MERGE]: Merged with tpa's branch.

bzr revid: uco@tinyerp.com-20120229123503-y9czl9nnpuf47ppl
This commit is contained in:
Ujjvala Collins (OpenERP)
2012-02-29 18:05:03 +05:30
@@ -113,8 +113,8 @@
<record id="view_contract_installation" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">sale.configuration</field>
<field name="inherit_id" ref="base.view_config_picking_policy"/>
<field name="model">res.config</field>
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="account_analytic_analysis" position="after">