From 991f538fb1797292920ca5272f2cf886a2685449 Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Thu, 22 Nov 2012 14:37:31 +0530 Subject: [PATCH] [IMP] cm,kg with height,length,widthand wigth bzr revid: shp@tinyerp.com-20121122090731-ozrp4wudie5e2row --- addons/delivery/delivery_view.xml | 2 +- addons/delivery/stock.py | 12 ++---------- addons/product/product.py | 21 +++++++-------------- addons/product/product_view.xml | 6 +++--- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index a8a2478f339..006e70a0324 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -248,7 +248,7 @@ - + diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index a975314d2ab..a84a22654b2 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -66,7 +66,7 @@ class stock_picking(osv.osv): }), 'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32), 'number_of_packages': fields.integer('Number of Packages'), - 'uom_id': fields.related('uom_id', 'product_id', type='many2one', relation='product.uom', string='UoM', readonly=True), + 'product_uom_weight': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",), } def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None): @@ -134,16 +134,8 @@ class stock_picking(osv.osv): invoice_obj.button_compute(cr, uid, [invoice.id], context=context) return result - def _get_uom(self, cr, uid, context=None): - try: - product = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'product_uom_kgm') - except ValueError: - # a ValueError is returned if the xml id given is not found in the table ir_model_data - return False - return product.id - _defaults = { - 'uom_id': _get_uom, + 'product_uom_weight': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('kg'))], context=c)[0], } stock_picking() diff --git a/addons/product/product.py b/addons/product/product.py index 1c45ee7f24b..6bee0567480 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -784,9 +784,9 @@ class product_packaging(osv.osv): 'height': fields.float('Height', help='The height of the package'), 'width': fields.float('Width', help='The width of the package'), 'length': fields.float('Length', help='The length of the package'), - 'uom_id': fields.related('uom_id', 'product_id', type='many2one', relation='product.uom', string='UoM', readonly=True), - 'uom_id1': fields.related('uom_id', 'product_id', type='many2one', relation='product.uom', string='UoM', readonly=True), - 'uom_id2': fields.related('uom_id', 'product_id', type='many2one', relation='product.uom', string='UoM', readonly=True), + 'product_uom_width': fields.many2one('product.uom', 'Unit of Measure',readonly="1", required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",), + 'product_uom_length': fields.many2one('product.uom', 'Unit of Measure', readonly="1",required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",), + 'product_uom_height': fields.many2one('product.uom', 'Unit of Measure',readonly="1", required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",), } @@ -812,21 +812,14 @@ class product_packaging(osv.osv): res = cr.fetchone() return (res and res[0]) or False - def _get_uom(self, cr, uid, context=None): - try: - product = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'product_uom_cm') - except ValueError: - # a ValueError is returned if the xml id given is not found in the table ir_model_data - return False - return product.id - _defaults = { 'rows' : lambda *a : 3, 'sequence' : lambda *a : 1, 'ul' : _get_1st_ul, - 'uom_id': _get_uom, - 'uom_id1': _get_uom, - 'uom_id2': _get_uom, + 'product_uom_width': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0], + 'product_uom_length': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0], + 'product_uom_height': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0] + } def checksum(ean): diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index e92331d77a0..5f1c55c6bdb 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -564,11 +564,11 @@ - + - + - +