Merge lp:~openerp-dev/openobject-addons/trunk-bug-800970-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello

  purchase,sale,stock : putting a product UOM decimal prescription In quantity field

Thanks

[Rucha (Open ERP) (rpa-openerp)]

review: Approve

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-09-15 08:54:54 +0000
+++ purchase/purchase.py	2011-09-15 13:43:03 +0000
@@ -622,7 +622,7 @@
     
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
+        'product_qty': fields.float('Quantity', required=True, digits_compute= dp.get_precision('Product UoM')),
         'date_planned': fields.date('Scheduled Date', required=True, select=True),
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-15 08:54:54 +0000
+++ sale/sale.py	2011-09-15 13:43:03 +0000
@@ -863,7 +863,7 @@
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoM'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),

=== modified file 'stock/wizard/stock_partial_move.py'
--- stock/wizard/stock_partial_move.py	2011-09-08 09:51:16 +0000
+++ stock/wizard/stock_partial_move.py	2011-09-15 13:43:03 +0000
@@ -22,6 +22,7 @@
 from osv import fields, osv
 from tools.translate import _
 import time
+import decimal_precision as dp
 
 
 class stock_partial_move_memory_out(osv.osv_memory):
@@ -29,7 +30,7 @@
     _rec_name = 'product_id'
     _columns = {
         'product_id' : fields.many2one('product.product', string="Product", required=True),
-        'quantity' : fields.float("Quantity", required=True),
+        'quantity' : fields.float("Quantity", required=True, digits_compute= dp.get_precision('Product UoM')),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
         'location_id': fields.many2one('stock.location', 'Location', required=True),