[FIX]: Defining supplier UOM for product not default

lp bug: https://launchpad.net/bugs/718896 fixed

bzr revid: ksa@tinyerp.co.in-20110216101533-o0en12copnkix3b4
This commit is contained in:
ksa (Open ERP)
2011-02-16 15:45:33 +05:30
parent 6fd5b215a2
commit a8d7bde551
2 changed files with 10 additions and 6 deletions
+9 -5
View File
@@ -482,7 +482,7 @@ class product_product(osv.osv):
'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True),
}
def unlink(self, cr, uid, ids, context=None):
unlink_ids = []
unlink_product_tmpl_ids = []
@@ -715,10 +715,14 @@ class product_supplierinfo(osv.osv):
result[supplier_info.id]['qty'] = qty
return result
def _get_uom_id(self, cr, uid, *args):
cr.execute('select id from product_uom order by id limit 1')
res = cr.fetchone()
return res and res[0] or False
def _get_uom_id(self, cr, uid, context=None):
uom_id = context.get('uom_id', False)
if uom_id:
return uom_id
else:
cr.execute('select id from product_uom order by id limit 1')
res = cr.fetchone()
return res and res[0] or False
_columns = {
'name' : fields.many2one('res.partner', 'Supplier', required=True,domain = [('supplier','=',True)], ondelete='cascade', help="Supplier of this product"),
+1 -1
View File
@@ -150,7 +150,7 @@
</page>
<page string="Suppliers">
<field colspan="4" name="seller_ids" nolabel="1"/>
<field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/>
</page>
<page string="Descriptions">
<separator string="Description"/>