Merge lp:~savoirfairelinux-openerp/openerp-manufacturing/dont-delete-report into lp:openerp-manufacturing

[Joao Alfredo Gama Batista]

Don't delete the original report id, just update the rml location.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Everything is OK.

Thank you.

Regards.

review: Approve (code review and test)

[Pedro Manuel Baeza (pedro.baeza)]

Everything is OK.

Thank you.

Regards.

review: Approve (code review and test)

[Niels Huylebroeck (red15)]

lgtm, a replacement of certain ir.actions.report.xml fields is certainly better than a delete (cause delete with such a fuzzy search could easily target the wrong action + prevents the module on it's own to update)

review: Approve

=== modified file 'mrp_industrial_design_bom/__openerp__.py'
--- mrp_industrial_design_bom/__openerp__.py	2013-04-08 15:44:53 +0000
+++ mrp_industrial_design_bom/__openerp__.py	2013-10-16 19:58:45 +0000
@@ -30,7 +30,9 @@
     'depends' : ['mrp'],
     "data" : ['mrp_industrial_design.xml'],
     'description': """
-Add the fields 'Bubble Number' and 'RefDes' (reference description) to a component in BoM view.
+This module adds the fields 'Bubble Number' and 'RefDes' (reference description) to a component in BoM view.
+
+It also point the BOM Structure report to a new version that uses the new fields.
 """,
     'auto_install': False,
     'installable': True
 
=== modified file 'mrp_industrial_design_bom/industrial_design.py'
--- mrp_industrial_design_bom/industrial_design.py	2013-04-08 15:44:53 +0000
+++ mrp_industrial_design_bom/industrial_design.py	2013-10-16 19:58:45 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as
@@ -15,18 +15,19 @@
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from openerp.osv import fields, orm
 
+
 class mrp_bom(orm.Model):
     _inherit = 'mrp.bom'
     _columns = {
         'bubble_number': fields.integer('No'),
         'refdes': fields.text('Notes'),
     }
-    
+
     _order = "bubble_number"
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'mrp_industrial_design_bom/mrp_industrial_design.xml'
--- mrp_industrial_design_bom/mrp_industrial_design.xml	2013-04-26 13:44:37 +0000
+++ mrp_industrial_design_bom/mrp_industrial_design.xml	2013-10-16 19:58:45 +0000
@@ -1,15 +1,10 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    <delete model="ir.actions.report.xml" search="[('name', '=', 'bom.structure')]" />
-        <report auto="True" 
-        header="False"
-        id="report_industrial_design_bom_structure"
-        model="mrp.bom"
-        name="industrialdesign.bom.structure"
-        rml="mrp_industrial_design_bom/report/bom_structure_industrial_design.rml"
-        string="BOM Structure"/>
-
+        <record model="ir.actions.report.xml" id="mrp.report_bom_structure">
+            <field name="report_file">mrp_industrial_design_bom/report/bom_structure_industrial_design.rml</field>
+            <field name="report_rml">mrp_industrial_design_bom/report/bom_structure_industrial_design.rml</field>
+        </record>
         <record model="ir.ui.view" id="mrp_bom_form_view_inherit">
             <field name="name">mrp.bom.form.inherit</field>
             <field name="model">mrp.bom</field>