qdp (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-ps-test-hip into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-ps-test-hip/+merge/136419
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-ps-test-hip/+merge/136419
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-ps-test-hip.
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2012-11-26 08:49:27 +0000
+++ mrp/mrp.py 2012-11-27 13:50:30 +0000
@@ -383,7 +383,7 @@
prod_obj = self.pool.get('product.product')
for obj in self.browse(cr, uid, ids, context=context):
for prod in prod_obj.browse(cr, uid, [obj.product_id], context=context):
- self.message_post(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
+ self.message_post(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name), context=context)
return True
mrp_bom()
=== modified file 'product/product.py'
--- product/product.py 2012-11-20 11:36:00 +0000
+++ product/product.py 2012-11-27 13:50:30 +0000
@@ -533,7 +533,7 @@
_table = "product_product"
_inherits = {'product.template': 'product_tmpl_id'}
_inherit = ['mail.thread']
- _order = 'default_code,name_template'
+ _order = 'default_code'
_columns = {
'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
@@ -552,7 +552,6 @@
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
'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, select=True),
'color': fields.integer('Color Index'),
# image: all image fields are base64 encoded and PIL-supported
'image': fields.binary("Image",
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
