From 89adfaf270faca211efa1b9d3f21a55c1e7c5fab Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 23 Aug 2012 16:07:27 +0200
Subject: [PATCH 1/2] [IMP] remove some of the @noupdate=1 introduced in a
 previous merge targeting modules' descriptions improvement this will preserve
 the previous behavior of modules update operation

bzr revid: abo@openerp.com-20120823140727-nu20t4wfwijgbf5p
---
 addons/anonymization/anonymization_view.xml                  | 5 ++---
 .../base_report_designer/wizard/base_report_design_view.xml  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 6d11dbe37fb..1a6c6c355d5 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-<data noupdate="1">
+<data>
 
     <!-- FIELD LIST -->
 
@@ -76,7 +76,7 @@
         </field>
     </record>
 
-      <!-- ACTION -->
+    <!-- ACTION -->
 
     <record model="ir.actions.act_window" id="action_ir_model_fields_anonymize_wizard">
         <field name="name">Anonymize Database</field>
@@ -163,4 +163,3 @@
 
 </data>
 </openerp>
-
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 434feea954b..b1abff2c8a2 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
+
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
@@ -55,6 +56,5 @@
             </field>
        </record>
 
-
     </data>
 </openerp>

From a5a3f9b582b5fa9df9c667acedb54e24dcde8660 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 23 Aug 2012 16:15:55 +0200
Subject: [PATCH 2/2] [IMP] indentation

bzr revid: abo@openerp.com-20120823141555-xexanpf1p1ebbcc1
---
 .../base_report_designer/wizard/base_report_design_view.xml  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index b1abff2c8a2..d2ee1f70dc3 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -18,7 +18,7 @@
                 </footer>
             </form>
             </field>
-       </record>
+        </record>
 
         <record id="action_view_base_report_sxw" model="ir.actions.act_window">
             <field name="name">Base Report sxw</field>
@@ -44,7 +44,8 @@
             <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
             </form>
             </field>
-       </record>
+        </record>
+
         <record id="view_base_report_file_rml" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>