odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] rename installer addons (potentially) conflicting with server modules 

bzr revid: xmo@tinyerp.com-20100113150121-kmki5vszfwyscow2
This commit is contained in:
Xavier Morel 2010-01-13 16:01:21 +01:00
parent 3dfcd6465b
commit 48f8a793c3
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_setup/installer.py
View File

@ -63,8 +63,8 @@ class base_setup_installer(osv.osv_memory):
'hr':fields.boolean('Human Resources'),
'pos':fields.boolean('Point of Sales'),
'marketing':fields.boolean('Marketing'),
'tools':fields.boolean('Miscellaneous Tools'),
'report_design':fields.boolean('Advanced Reporting'),
'misc_tools':fields.boolean('Miscellaneous Tools'),
'report_designer':fields.boolean('Advanced Reporting'),
# Vertical modules
'profile_association':fields.boolean('Associations'),
'profile_training':fields.boolean('Training Centers'),

0
addons/report/__init__.py → addons/misc_tools/__init__.py
View File

2
addons/tools/__terp__.py → addons/misc_tools/__terp__.py
View File

@ -30,7 +30,7 @@
'website': 'http://www.openerp.com',
'init_xml': [],
'update_xml': [
'tools_installer.xml',
'misc_tools_installer.xml',
],
'demo_xml': [],
'installable': True,

6
addons/tools/installer.py → addons/misc_tools/installer.py
View File

@ -20,8 +20,8 @@
##############################################################################
from osv import fields, osv
class tools_installer(osv.osv_memory):
_name = 'tools.installer'
class misc_tools_installer(osv.osv_memory):
_name = 'misc_tools.installer'
_inherit = 'res.config.installer'
_columns = {
@ -35,5 +35,5 @@ class tools_installer(osv.osv_memory):
'lunch': True,
}
tools_installer()
misc_tools_installer()

16
addons/tools/tools_installer.xml → addons/misc_tools/misc_tools_installer.xml
View File

@ -1,8 +1,8 @@
<openerp>
<data>
<record id="view_tools_installer" model="ir.ui.view">
<field name="name">tools.installer.view</field>
<field name="model">tools.installer</field>
<record id="view_misc_tools_installer" model="ir.ui.view">
<field name="name">misc_tools.installer.view</field>
<field name="model">misc_tools.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
@ -44,18 +44,18 @@
</field>
</record>
<record id="action_tools_installer" model="ir.actions.act_window">
<record id="action_misc_tools_installer" model="ir.actions.act_window">
<field name="name">Tools Modules Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">tools.installer</field>
<field name="view_id" ref="view_tools_installer"/>
<field name="res_model">misc_tools.installer</field>
<field name="view_id" ref="view_misc_tools_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="tools_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_tools_installer"/>
<record id="misc_tools_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_misc_tools_installer"/>
<field name="sequence">1</field>
</record>
</data>

0
addons/tools/__init__.py → addons/report_designer/__init__.py
View File

2
addons/report/__terp__.py → addons/report_designer/__terp__.py
View File

@ -30,7 +30,7 @@
'website': 'http://www.openerp.com',
'init_xml': [],
'update_xml': [
'report_installer.xml',
'report_designer_installer.xml',
],
'demo_xml': [],
'installable': True,

6
addons/report/installer.py → addons/report_designer/installer.py
View File

@ -20,8 +20,8 @@
##############################################################################
from osv import fields, osv
class report_installer(osv.osv_memory):
_name = 'report.installer'
class report_designer_installer(osv.osv_memory):
_name = 'report_designer.installer'
_inherit = 'res.config.installer'
_columns = {
@ -30,5 +30,5 @@ class report_installer(osv.osv_memory):
'base_report_creator':fields.boolean('Query Builder'),
'olap':fields.boolean('Business Intelligence Report'),
}
report_installer()
report_designer_installer()

16
addons/report/report_installer.xml → addons/report_designer/report_designer_installer.xml
View File

@ -1,8 +1,8 @@
<openerp>
<data>
<record id="view_report_installer" model="ir.ui.view">
<field name="name">report.installer.view</field>
<field name="model">report.installer</field>
<record id="view_report_designer_installer" model="ir.ui.view">
<field name="name">report_designer.installer.view</field>
<field name="model">report_designer.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
@ -43,18 +43,18 @@
</field>
</record>
<record id="action_report_installer" model="ir.actions.act_window">
<record id="action_report_designer_installer" model="ir.actions.act_window">
<field name="name">Report Modules Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">report.installer</field>
<field name="view_id" ref="view_report_installer"/>
<field name="res_model">report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="report_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_installer"/>
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="sequence">1</field>
</record>
</data>