odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]improve typo and solve the product duplication problem. 

bzr revid: dka@tinyerp.com-20131101102528-21x66oz8wn5uxaq2
This commit is contained in:
Darshan Kalola (OpenERP) 2013-11-01 15:55:28 +05:30
parent d79ec7639e
commit 50963cc810
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/product/product.py
View File

@ -396,6 +396,17 @@ class product_template(osv.osv):
raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
return super(product_template, self).write(cr, uid, ids, vals, context=context)
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
template = self.read(cr, uid, id, ['name', 'product_variant_ids'], context=context)
default = default.copy()
default.update(name=_("%s (copy)") % (template['name']))
id = super(product_template, self).copy(cr, uid, id, default=default, context=context)
if template['product_variant_ids']:
self.write(cr, uid, id, default, context)
return id
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
'list_price': 1,
@ -788,10 +799,9 @@ class product_product(osv.osv):
# will do the other languages).
context_wo_lang = context.copy()
context_wo_lang.pop('lang', None)
product = self.read(cr, uid, id, ['name'], context=context_wo_lang)
product = self.read(cr, uid, id, ['name', 'list_price', 'standard_price', 'categ_id'], context=context_wo_lang)
default = default.copy()
default.update(name=_("%s (copy)") % (product['name']))
default.update(name=_("%s (copy)") % (product['name']), list_price=product['list_price'], standard_price=product['standard_price'], categ_id=product['categ_id'][0], product_tmpl_id=None)
if context.get('variant',False):
fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
'price_margin', 'price_extra']

2
addons/product/test/compute_price_margin.yml
View File

@ -13,7 +13,7 @@
price_margin: 10.0
price_extra: 30.0
-
Now i check new sale price after setting price margins and price extra is equal to (20 + ((20 * 10) / 100)) + 30.
Now I check new sale price after setting price margins and price extra is equal to (20 + ((20 * 10) / 100)) + 30.
-
!python {model: product.template}: |
template = self.browse(cr, uid, ref("product_template_test1"))