From 6e001f935672e8714e860eb25cfce4647c938ba2 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 17 Aug 2012 17:02:50 +0530
Subject: [PATCH 1/8] [IMP]Base : __openerp__.py updated

bzr revid: hsa@tinyerp.com-20120817113250-berxzlqkejhoef1x
---
 openerp/addons/base/__openerp__.py             | 6 +++---
 openerp/addons/base/base_menu.xml              | 2 +-
 openerp/addons/base/res/res_config.xml         | 2 +-
 openerp/addons/base/res/res_security.xml       | 2 +-
 openerp/addons/base/security/base_security.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 5b65bff4bd7..363d255d293 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -30,7 +30,7 @@
     'maintainer': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [],
-    'init_xml': [
+    'data': [
         'base_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
@@ -38,7 +38,7 @@
         'res/res_config.xml',
         'data/res.country.state.csv'
     ],
-    'update_xml': [
+    'data': [
         'ir/wizard/wizard_menu_view.xml',
         'ir/ir.xml',
         'ir/ir_filters.xml',
@@ -77,7 +77,7 @@
         'res/res_widget_data.xml',
         'publisher_warranty/publisher_warranty_data.xml',
     ],
-    'demo_xml': [
+    'demo': [
         'base_demo.xml',
         'res/res_partner_demo.xml',
         'res/res_partner_demo.yml',
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 770e0e2d329..f3e0cda7e12 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Top menu item -->
         <menuitem name="Reporting"
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index bdfd6ab329c..a705250b989 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="res_config_view_base" model="ir.ui.view">
             <field name="name">res.config.view.base</field>
             <field name="model">res.config</field>
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index f02abd90985..8aa18bd8df4 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0">
+<data noupdate="1">
 
     <record model="res.groups" id="group_partner_manager">
         <field name="name">Partner Manager</field>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index cd0b7e999b3..11be6e35bd1 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
 <!--
  Users Groups

From 9badeefa4742af12617011f7c35682c19ace671e Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 20 Aug 2012 11:57:34 +0530
Subject: [PATCH 2/8] [IMP]description to rst2html

bzr revid: pna@tinyerp.com-20120820062734-fqt46hxmgv35tlgf
---
 openerp/addons/base/module/module.py       | 12 +++++++++++-
 openerp/addons/base/module/module_view.xml |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 5751ed678eb..fbbc21bdee3 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -29,6 +29,7 @@ from openerp import modules, pooler, release, tools, addons
 from openerp.tools.parse_version import parse_version
 from openerp.tools.translate import _
 from openerp.osv import fields, osv, orm
+from docutils.core import publish_string
 
 _logger = logging.getLogger(__name__)
 
@@ -94,6 +95,15 @@ class module(osv.osv):
                           'module %s', name, exc_info=True)
         return info
 
+    def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        res = {}
+        for module in self.browse(cr, uid, ids, context=context):
+            desc = self.get_module_info(module.name).get('description', '')
+            overrides = dict(embed_stylesheet= False, doctitle_xform= False)
+            output = publish_string(source= desc, writer_name= 'html', settings_overrides= overrides)
+            res[module.id] = output
+        return res
+
     def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for m in self.browse(cr, uid, ids):
@@ -182,7 +192,7 @@ class module(osv.osv):
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
         'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
         'summary': fields.char('Summary', size=64, readonly=True, translate=True),
-        'description': fields.text("Description", readonly=True, translate=True),
+        'description': fields.function(_get_desc, string='Description', type='html', method=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
         'contributors': fields.text('Contributors', readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 19f9dbdaa44..ec7db50bbe6 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -38,7 +38,7 @@
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
                 <search string="Search modules">
-                    <field name="name" filter_domain="['|', '|', '|', ('description', 'ilike', self), ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
+                    <field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
                         'ilike', self)]"/>
                     <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                     <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>

From 2dd31f53194039bc51ae8db72e620290a222f13f Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 20 Aug 2012 17:42:20 +0530
Subject: [PATCH 3/8] [Imp]output_encoding

bzr revid: pna@tinyerp.com-20120820121220-bz5ysxtw7kzhxkin
---
 openerp/addons/base/module/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fbbc21bdee3..e69e51c0bb0 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -99,7 +99,7 @@ class module(osv.osv):
         res = {}
         for module in self.browse(cr, uid, ids, context=context):
             desc = self.get_module_info(module.name).get('description', '')
-            overrides = dict(embed_stylesheet= False, doctitle_xform= False)
+            overrides = dict(embed_stylesheet= False, doctitle_xform= False, output_encoding = 'unicode')
             output = publish_string(source= desc, writer_name= 'html', settings_overrides= overrides)
             res[module.id] = output
         return res

From baaefbe8d9d9385062a758acb69096ded17e00f1 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Mon, 20 Aug 2012 18:42:08 +0530
Subject: [PATCH 4/8] [IMP] Improved __openerp__.py of base

bzr revid: pso@tinyerp.com-20120820131208-w31ht9r7ttsh2ran
---
 openerp/addons/base/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 85b239e86c4..354b086879c 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -36,7 +36,7 @@
         'base_menu.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'data/res.country.state.csv'
+        'data/res.country.state.csv',
         'ir/wizard/wizard_menu_view.xml',
         'ir/ir.xml',
         'ir/ir_filters.xml',

From a2db8022d326c4ee7012cc2d1241706345fc29bd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 18:40:54 +0200
Subject: [PATCH 5/8] [FIX] xml import: when using a menuitem tag, properly
 determine the type of action that is referenced the  attribute for the 
 element should now be useless

bzr revid: abo@openerp.com-20120821164054-6zzad2k6nmebqe35
---
 openerp/tools/convert.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 36f560ba62c..cf3967b1da0 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -591,7 +591,22 @@ form: module.record_id""" % (xml_id,)
 
         if rec.get('action'):
             a_action = rec.get('action','').encode('utf8')
-            a_type = rec.get('type','').encode('utf8') or 'act_window'
+
+            # determine the type of action
+            # either the type is explicitly provided in the menuitem
+            if (rec.get('type','')):
+                a_type = rec.get('type','').encode('utf8')
+            # either we have to find it by ourselves
+            else:
+                # prevent redundant appearance of the module name for external xml ids
+                a_action_simplified = a_action.split('.')[1] if '.' in a_action else a_action
+
+                ir_action_ref = self.pool.get('ir.model.data').get_object_reference(cr, self.uid, self.module, a_action_simplified)
+                ir_action = self.pool.get(ir_action_ref[0]).browse(cr, self.uid, [ir_action_ref[1]])[0]
+
+                # isolate the last part of the type field, which is the only one revelant in this case
+                a_type = ir_action.type.split('.')[-1]
+
             icons = {
                 "act_window": 'STOCK_NEW',
                 "report.xml": 'STOCK_PASTE',
@@ -601,6 +616,7 @@ form: module.record_id""" % (xml_id,)
                 "server": 'STOCK_EXECUTE',
             }
             values['icon'] = icons.get(a_type,'STOCK_NEW')
+
             if a_type=='act_window':
                 a_id = self.id_get(cr, a_action)
                 cr.execute('select view_type,view_mode,name,view_id,target from ir_act_window where id=%s', (int(a_id),))
@@ -627,7 +643,7 @@ form: module.record_id""" % (xml_id,)
                     values['icon'] = 'STOCK_EXECUTE'
                 if not values.get('name', False):
                     values['name'] = action_name
-            
+
             elif a_type in ['wizard', 'url', 'client', 'server'] and not values.get('name'):
                 a_id = self.id_get(cr, a_action)
                 a_table = 'ir_act_%s' % a_type

From 8dd80d5dcfa27fad822152f9f03c8ab2f76dd55e Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 19:22:24 +0200
Subject: [PATCH 6/8] [FIX] handling of the action's module xml id. also don't
 use the  attribute anymore

bzr revid: abo@openerp.com-20120821172224-9unwry0p27tn7d82
---
 openerp/tools/convert.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index cf3967b1da0..5fd88889602 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -593,19 +593,18 @@ form: module.record_id""" % (xml_id,)
             a_action = rec.get('action','').encode('utf8')
 
             # determine the type of action
-            # either the type is explicitly provided in the menuitem
-            if (rec.get('type','')):
-                a_type = rec.get('type','').encode('utf8')
-            # either we have to find it by ourselves
+            if ('.' in a_action):
+                # this is an action refering to another module: extract this module's name
+                a_action_module, a_action_name = a_action.split('.')
             else:
-                # prevent redundant appearance of the module name for external xml ids
-                a_action_simplified = a_action.split('.')[1] if '.' in a_action else a_action
+                # this is a local action: fetch the current module's name
+                a_action_module = self.module
+                a_action_name = a_action
 
-                ir_action_ref = self.pool.get('ir.model.data').get_object_reference(cr, self.uid, self.module, a_action_simplified)
-                ir_action = self.pool.get(ir_action_ref[0]).browse(cr, self.uid, [ir_action_ref[1]])[0]
-
-                # isolate the last part of the type field, which is the only one revelant in this case
-                a_type = ir_action.type.split('.')[-1]
+            # fetch the model and the res id
+            ir_action_ref = self.pool.get('ir.model.data').get_object_reference(cr, self.uid, a_action_module, a_action_name)
+            # get the part of the model we need
+            a_type = ir_action_ref[0].split('.')[-1]
 
             icons = {
                 "act_window": 'STOCK_NEW',

From a337ca201d7d72b485c0e330c433afc50bef458a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Aug 2012 16:49:46 +0200
Subject: [PATCH 7/8] [IMP] rng: forbid redundant @type for menuitem, now
 inferred from the action type + minor cleanup

bzr revid: odo@openerp.com-20120822144946-fdsw9ee1ia3nfe86
---
 openerp/import_xml.rng   | 1 -
 openerp/tools/convert.py | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index bf5a9e1800e..5dd789c6e95 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -185,7 +185,6 @@
             <rng:optional> <rng:attribute name="string"/> </rng:optional>
             <rng:optional> <rng:attribute name="sequence"/> </rng:optional>
             <rng:optional> <rng:attribute name="groups"/> </rng:optional>
-            <rng:optional> <rng:attribute name="type"/> </rng:optional>
             <rng:optional> <rng:attribute name="menu"/> </rng:optional>
             <rng:empty />
         </rng:element>
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 5fd88889602..8269fa5d7ff 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -593,11 +593,11 @@ form: module.record_id""" % (xml_id,)
             a_action = rec.get('action','').encode('utf8')
 
             # determine the type of action
-            if ('.' in a_action):
-                # this is an action refering to another module: extract this module's name
+            if '.' in a_action:
+                # action referring to another module
                 a_action_module, a_action_name = a_action.split('.')
             else:
-                # this is a local action: fetch the current module's name
+                # local action: use current module
                 a_action_module = self.module
                 a_action_name = a_action
 

From 0b29e7579d0f42bf0e6f74b16edf53845f417c53 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 22 Aug 2012 19:46:35 +0200
Subject: [PATCH 8/8] [IMP] avoid re-computing the module's  field by setting
 it to

bzr revid: abo@openerp.com-20120822174635-agqupq0iyqc0rn9v
---
 openerp/addons/base/module/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index c5df273ea02..d523ff0ac7f 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -192,7 +192,7 @@ class module(osv.osv):
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
         'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
         'summary': fields.char('Summary', size=64, readonly=True, translate=True),
-        'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True),
+        'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True, store=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
         'contributors': fields.text('Contributors', readonly=True),