Upgrade issue10363.diff from production-237cad37234f
This commit is contained in:
parent
c801d8303b
commit
f4bf85843f
|
@ -2,15 +2,7 @@ diff --git a/trytond/trytond/modules/production/bom.py b/trytond/trytond/modules
|
||||||
index dc3faeb..3f9c369 100644
|
index dc3faeb..3f9c369 100644
|
||||||
--- a/trytond/trytond/modules/production/bom.py
|
--- a/trytond/trytond/modules/production/bom.py
|
||||||
+++ b/trytond/trytond/modules/production/bom.py
|
+++ b/trytond/trytond/modules/production/bom.py
|
||||||
@@ -1,6 +1,6 @@
|
@@ -21,15 +21,15 @@ class BOM(DeactivableMixin, ModelSQL, ModelView):
|
||||||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
|
||||||
# this repository contains the full copyright notices and license terms.
|
|
||||||
-from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields, Unique
|
|
||||||
+from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields
|
|
||||||
from trytond.wizard import Wizard, StateView, Button
|
|
||||||
from trytond.pyson import Eval
|
|
||||||
from trytond.pool import Pool
|
|
||||||
@@ -21,13 +21,15 @@ class BOM(DeactivableMixin, ModelSQL, ModelView):
|
|
||||||
Compute factor for an output product
|
Compute factor for an output product
|
||||||
'''
|
'''
|
||||||
Uom = Pool().get('product.uom')
|
Uom = Pool().get('product.uom')
|
||||||
|
@ -26,7 +18,8 @@ index dc3faeb..3f9c369 100644
|
||||||
+ output.uom, output.quantity, uom, round=False)
|
+ output.uom, output.quantity, uom, round=False)
|
||||||
+ if output_quantity:
|
+ if output_quantity:
|
||||||
+ return quantity / output_quantity
|
+ return quantity / output_quantity
|
||||||
+ else:
|
else:
|
||||||
|
- return 0.0
|
||||||
+ return 0
|
+ return 0
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue