Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso-description-hsa
into lp:~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso-description-hsa/+merge/120147
Hello,
I updated
- __openerp__.py in `update_xml` and `init_xml` are now `data`
- The files concerned by `init_xml` should receive the property `noupdate="1"
- `demo_xml` is now `demo`
- Single quotes in __openerp__.py , excepted for the multiline entries
typically `description`.
Thanks
-HSA
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso-description-hsa/+merge/120147
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-08-14 14:56:56 +0000
+++ openerp/addons/base/__openerp__.py 2012-08-17 11:36:19 +0000
@@ -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',
=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml 2012-07-18 10:11:29 +0000
+++ openerp/addons/base/base_menu.xml 2012-08-17 11:36:19 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<!-- Top menu item -->
<menuitem name="Reporting"
=== modified file 'openerp/addons/base/res/res_config.xml'
--- openerp/addons/base/res/res_config.xml 2012-08-07 12:51:38 +0000
+++ openerp/addons/base/res/res_config.xml 2012-08-17 11:36:19 +0000
@@ -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>
=== modified file 'openerp/addons/base/res/res_security.xml'
--- openerp/addons/base/res/res_security.xml 2012-04-04 09:08:18 +0000
+++ openerp/addons/base/res/res_security.xml 2012-08-17 11:36:19 +0000
@@ -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>
=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml 2012-07-02 13:03:39 +0000
+++ openerp/addons/base/security/base_security.xml 2012-08-17 11:36:19 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
- <data noupdate="0">
+ <data noupdate="1">
<!--
Users Groups
_______________________________________________
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
