[MERGE] Mearge with main addons

bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
This commit is contained in:
Purnendu Singh (OpenERP)
2012-06-22 11:22:30 +05:30
386 changed files with 17381 additions and 19508 deletions
@@ -151,9 +151,9 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>
<label for="name" class="oe_form_readonly_hidden"/>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_form_readonly_hidden"/>
<label for="project_id" class="oe_edit_only"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
@@ -164,7 +164,7 @@
</group><group>
<label for="duration"/>
<div>
<field name="duration" class="oe_form_inline"/>
<field name="duration" class="oe_inline"/>
<field name="product_uom"/>
</div>
</group>