merge

bzr revid: fp@tinyerp.com-20111111134819-8nncvla62v86l7qr
2011-11-11 14:48:19 +01:00
parent 8bf5afa398 b0181c1cd8
commit 99b328c8a6
3 changed files with 11 additions and 0 deletions
@@ -5080,3 +5080,4 @@ msgstr ""

 #~ msgid "Products Categories"
 #~ msgstr "Catégories de produits"
+
@@ -3693,3 +3693,8 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""

+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
@@ -111,6 +111,11 @@
                        <newline/>
                        <field name="virtual_available"/>
                    </group>
+                    <group colspan="2" col="2" name="stock_variations" groups="base.group_extended">
+                        <separator string="Expected Stock Variations" colspan="2"/>
+                        <field name="incoming_qty"/>
+                        <field name="outgoing_qty"/>
+                    </group>
                    <group colspan="2" col="2" name="lot" groups="base.group_extended">
                        <separator string="Lots" colspan="4"/>
                        <field name="track_production" />