merge

2015-02-12 12:50:24 +01:00 · 2015-02-12 12:50:24 +01:00 · 92e963b6b4
parent 0bb62a0eff 0e0b238d0b
commit 92e963b6b4
2 changed files with 13 additions and 0 deletions
--- a/inventory.diff
+++ b/inventory.diff
@ -0,0 +1,12 @@
+diff -r 077108f6fcb6 inventory.py
+--- a/modules/stock/inventory.py	Mon Jan 26 17:16:34 2015 +0100
+++ b/modules/stock/inventory.py	Thu Feb 12 12:30:00 2015 +0100
+@@ -216,6 +216,8 @@
+                         or product2consumable[product_id]):
+                     continue
+                 quantity, uom_id = product_qty[product_id]
+                if not quantity:
+                    continue
+                 values = Line.create_values4complete(product_id, inventory,
+                     quantity, uom_id)
+                 to_create.append(values)
--- a/1
+++ b/1
@ -35,3 +35,4 @@ issue3991003_40001.diff
 issue4011003_200001.diff
 issue9801002_40001.diff
 issue5881002_1.diff
+inventory.diff