summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Vora (OpenERP) <jvo@tinyerp.com>2011-04-01 11:01:49 +0530
committerJay Vora (OpenERP) <jvo@tinyerp.com>2011-04-01 11:01:49 +0530
commit2cfcce8e7f9aacbdcfd89c64a49dee12f3d562cc (patch)
tree264bd4e9fbd7b5063fb5765ad5d747ac524aa9fe
parent27894201540a03a1ce81a2e50e66d833761ab52f (diff)
parent2672ac6e4d5aa274f65226b4af710b6f3c551030 (diff)
[Merge] Merged the branch for the fix of lp:729539
bzr revid: jvo@tinyerp.com-20110401053149-qkbj0qe6jx03u9j8
-rw-r--r--addons/stock/wizard/stock_move.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 8cfdc648349..fad31d774ce 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -21,6 +21,8 @@
from osv import fields, osv
+import decimal_precision as dp
+
class stock_move_track(osv.osv_memory):
_name = "stock.move.track"
_description = "Track moves"
@@ -198,7 +200,7 @@ class split_in_production_lot(osv.osv_memory):
return res
_columns = {
- 'qty': fields.integer('Quantity'),
+ 'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
'product_uom': fields.many2one('product.uom', 'UoM'),
'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
@@ -297,12 +299,12 @@ class stock_move_split_lines_exist(osv.osv_memory):
_description = "Exist Split lines"
_columns = {
'name': fields.char('Tracking serial', size=64),
- 'quantity': fields.integer('Quantity'),
+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'lot_id': fields.many2one('stock.move.split', 'Lot'),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
}
_defaults = {
- 'quantity': lambda *x: 1,
+ 'quantity': lambda *x: 1.00,
}
stock_move_split_lines_exist()
@@ -312,13 +314,13 @@ class stock_move_split_lines(osv.osv_memory):
_description = "Split lines"
_columns = {
'name': fields.char('Tracking serial', size=64),
- 'quantity': fields.integer('Quantity'),
+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'use_exist' : fields.boolean('Existing Lot'),
'lot_id': fields.many2one('stock.move.split', 'Lot'),
'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
}
_defaults = {
- 'quantity': lambda *x: 1,
+ 'quantity': lambda *x: 1.00,
'action' : lambda *x: 'split',
}
stock_move_split_lines()