[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121011045535-go6ytkhno83j5vv3
bzr revid: mdi@tinyerp.com-20121012055651-b71ggro9e85014y2
bzr revid: mdi@tinyerp.com-20121015053308-o0p01graipkg5b9m
bzr revid: mdi@tinyerp.com-20121016044216-e3lc1zumg2hvnm8e
bzr revid: mdi@tinyerp.com-20121017044133-zl7tptv6fvsl05hj
bzr revid: mdi@tinyerp.com-20121018040828-189tvqs6c6837hvr
bzr revid: mdi@tinyerp.com-20121019044050-u5uy3jqntkwqhx5b
bzr revid: mdi@tinyerp.com-20121022041359-4wpqftbqum8t4284

diff --cc addons/project/project_view.xml
index 64b3d77,249fb3e..8d5fbc1
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -135,8 -135,7 +135,8 @@@
                                      <field name="resource_calendar_id"/>
                                  </group>
                                  <group string="Miscellaneous" name="misc">
 +                                    <field name="date_start"/>
-                                     <field name="date"/>
+                                     <field name="date" string="End Date"/>
                                      <field name="priority" groups="base.group_no_one"/>
                                      <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>