[MERGE] with lp:openobject-addons

bzr revid: tfr@openerp.com-20110104100235-iovwlof7x7u9arlh
2011-01-04 11:02:35 +01:00
parent e1a001b64e 204613eee3
commit 6ceeb281e0
2 changed files with 8 additions and 1 deletions
@@ -154,6 +154,8 @@
                                    <field name="sequence"/>
                                    <field name="name"/>
                                    <field name="user_id"/>
+                                    <field name="date_start"/>
+                                    <field name="date_end" />
                                    <field name="planned_hours" widget="float_time"/>
                                    <field name="project_id" invisible="1"/>
                                    <field name="total_hours" sum='Total Hours'/>
@@ -172,6 +174,7 @@
                                            <group colspan="2" col="2">
                                                  <separator string="Dates" colspan="2"/>
                                                  <field name="date_start"/>
+                                                  <field name="date_end" />
                                                  <field name="date_deadline"/>
                                            </group>
                                            <group colspan="2" col="2">
@@ -2806,11 +2806,15 @@ msgstr "Nom de révision"

 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_root
 #: view:stock.warehouse:0
 msgid "Warehouse"
 msgstr "Entrepôt"

+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_root
+msgid "Warehouse"
+msgstr "Stocks"
+
 #. module: stock
 #: view:stock.location.product:0
 msgid ""