[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
This commit is contained in:
Purnendu Singh (OpenERP)
2012-06-19 10:31:00 +05:30
75 changed files with 2831 additions and 1302 deletions
@@ -213,7 +213,7 @@
</group>
</group>
<separator string="Force Assigned Users"/>
<field name="user_force_ids"/>
<field name="user_force_ids" widget="many2many_tags" />
<separator string="Previous Phases"/>
<field name="previous_phase_ids"/>
<separator string="Next Phases"/>