Merge lp:~kinner-vachhani/openobject-addons/6.1-bom-duplicate-suffix-1069681 into lp:openobject-addons/6.1

[Kinner Vachhani]

lp:1069681

Unmerged revisions

7234. By Kinner Vachhani on 2013-07-02

[Fix] Only use copy suffix for BOM and not for BOM lines lp:1069681

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-10-05 10:44:47 +0000
+++ mrp/mrp.py	2013-07-02 15:09:27 +0000
@@ -357,7 +357,11 @@
         if default is None:
             default = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False})
+        #[Fix] Only use copy suffix for BOM and not for BOM lines
+        if '__copy_data_seen' in context:
+            default.update({'name': bom_data['name'], 'bom_id':False})
+        else:
+            default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False})
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
 mrp_bom()