diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index d390d235f92..d4e7098c282 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -43,12 +43,22 @@ The kernel of OpenERP, needed for all installation.
'res/res_config.xml',
'data/res.country.state.csv',
'ir/wizard/wizard_menu_view.xml',
- 'ir/ir.xml',
- 'ir/ir_translation_view.xml',
- 'ir/ir_filters.xml',
+ 'ir/ir_actions.xml',
+ 'ir/ir_attachment_view.xml',
'ir/ir_config_parameter_view.xml',
- 'ir/workflow/workflow_view.xml',
+ 'ir/ir_cron_view.xml',
+ 'ir/ir_filters.xml',
+ 'ir/ir_mail_server_view.xml',
+ 'ir/ir_model_view.xml',
+ 'ir/ir_rule_view.xml',
+ 'ir/ir_sequence_view.xml',
+ 'ir/ir_translation_view.xml',
+ 'ir/ir_ui_menu_view.xml',
+ 'ir/ir_ui_view_view.xml',
+ 'ir/ir_values_view.xml',
+ 'ir/osv_memory_autovacuum.xml',
'ir/report/ir_report.xml',
+ 'ir/workflow/workflow_view.xml',
'module/module_view.xml',
'module/module_data.xml',
'module/module_report.xml',
diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index ba8b785f39d..c6034e0f7ee 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -20,8 +20,6 @@
##############################################################################
import ir_model
-import ir_model_constraint
-import ir_model_relation
import ir_sequence
import ir_needaction
import ir_ui_menu
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
deleted file mode 100644
index 491bc9c8131..00000000000
--- a/openerp/addons/base/ir/ir.xml
+++ /dev/null
@@ -1,1791 +0,0 @@
-
-
-
-
-
-
- ir.values.form.action
- ir.values
-
-
-
-
-
-
- ir.values.form.defaults
- ir.values
-
-
-
-
-
-
- ir.values.tree.action
- ir.values
-
-
-
-
-
-
-
-
-
-
- ir.values.search.action
- ir.values
-
-
-
-
-
-
-
-
-
-
-
-
- Action Bindings
- ir.actions.act_window
- ir.values
- form
- tree,form
-
- [('key','=','action')]
- {'default_key':'action'}
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- User-defined Defaults
- ir.actions.act_window
- ir.values
- form
- tree,form
-
- [('key','=','default')]
- {'default_key':'default','default_key2':''}
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
-
- ir.sequence.form
- ir.sequence
-
-
-
-
-
-
- ir.sequence.tree
- ir.sequence
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.sequence.search
- ir.sequence
-
-
-
-
-
-
-
-
-
-
- Sequences
- ir.actions.act_window
- ir.sequence
- form
-
- {'active_test': False}
-
-
-
-
-
-
-
- ir.sequence.type.form
- ir.sequence.type
-
-
-
-
-
-
- ir.sequence.type.tree
- ir.sequence.type
-
-
-
-
-
-
-
-
-
- ir.sequence.type.search
- ir.sequence.type
-
-
-
-
-
-
-
-
- Sequence Codes
- ir.actions.act_window
- ir.sequence.type
- form
- tree,form
-
-
-
-
-
-
-
- ir.actions.actions
- ir.actions.actions
-
-
-
-
-
- ir.actions.actions.tree
- ir.actions.actions
-
-
-
-
-
-
-
-
- ir.actions.actions.search
- ir.actions.actions
-
-
-
-
-
-
-
-
- Actions
- ir.actions.act_window
- ir.actions.actions
- form
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.report.xml
- ir.actions.report.xml
-
-
-
-
-
- ir.actions.report.xml.tree
- ir.actions.report.xml
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.report.xml.search
- ir.actions.report.xml
-
-
-
-
-
-
-
-
-
-
-
- Reports
- ir.actions.act_window
- ir.actions.report.xml
- form
-
-
-
-
-
-
- ir.actions.windows.tree
- ir.actions.act_window
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.windows.form
- ir.actions.act_window
-
-
-
-
-
- ir.actions.windows.search
- ir.actions.act_window
-
-
-
-
-
-
-
-
-
-
-
-
- Window Actions
- ir.actions.act_window
- ir.actions.act_window
- form
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
- ir.actions.wizard.tree
- ir.actions.wizard
-
-
-
-
-
-
-
-
-
-
- ir.actions.wizard
- ir.actions.wizard
-
-
-
-
-
-
- ir.actions.wizard.search
- ir.actions.wizard
-
-
-
-
-
-
-
-
- Wizards
- ir.actions.act_window
- ir.actions.wizard
- form
-
-
-
-
-
-
-
- ir.ui.view
- ir.ui.view
-
-
-
-
-
-
- ir.ui.view.tree
- ir.ui.view
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.ui.view.search
- ir.ui.view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Views
- ir.actions.act_window
- ir.ui.view
-
- Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need.
-
-
-
-
-
-
- ir.ui.view.custom.search
- ir.ui.view.custom
-
-
-
-
-
-
-
-
- ir.ui.view.custom.form
- ir.ui.view.custom
-
-
-
-
-
- ir.ui.view.custom.tree
- ir.ui.view.custom
-
-
-
-
-
-
-
-
- Customized Views
- ir.actions.act_window
- ir.ui.view.custom
- Customized views are used when users reorganize the content of their dashboard views (via web client)
-
-
-
-
-
-
- ir.attachment.view
- ir.attachment
-
-
-
-
-
- ir.attachment.view.tree
- ir.attachment
-
-
-
-
-
-
-
-
-
-
-
-
- ir.attachment.search
- ir.attachment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attachments
- ir.actions.act_window
- ir.attachment
- form
-
-
-
-
-
-
-
- ir.model.form
- ir.model
-
-
-
-
-
-
-
- ir.model.tree
- ir.model
-
-
-
-
-
-
-
-
-
-
-
- ir.model.search
- ir.model
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.fields.form
- ir.model.fields
-
-
-
-
-
-
- ir.model.fields.tree
- ir.model.fields
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.fields.search
- ir.model.fields
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.data.form
- ir.model.data
-
-
-
-
-
-
- ir.model.data.list
- ir.model.data
-
-
-
-
-
-
-
-
-
-
-
- ir.model.data.search
- ir.model.data
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.constraint.form
- ir.model.constraint
-
-
-
-
-
-
- ir.model.constraint.list
- ir.model.constraint
-
-
-
-
-
-
-
-
-
-
-
- ir.model.relation.form
- ir.model.relation
-
-
-
-
-
-
- ir.model.relation.list
- ir.model.relation
-
-
-
-
-
-
-
-
-
-
- Models
- ir.model
- form
- {'manual':True}
-
-
-
-
-
-
- Fields
- ir.model.fields
- form
- {'manual':True}
-
-
-
-
-
- External Identifiers
- ir.model.data
- form
-
-
-
-
-
- Model Constraints
- ir.model.constraint
- form
-
-
-
-
-
- ManyToMany Relations
- ir.model.relation
- form
-
-
-
-
-
-
-
- ir.ui.view_sc
- ir.ui.view_sc
-
-
-
-
-
- ir.ui.view_sc
- ir.ui.view_sc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.tree
- ir.cron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.form
- ir.cron
-
-
-
-
-
-
- ir.cron.search
- ir.cron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.calendar
- ir.cron
-
-
-
-
-
-
-
-
-
-
- Scheduled Actions
- ir.cron
- form
- tree,form,calendar
- {'active_test': False}
-
-
-
-
-
-
-
-
-
- ir.model.access.tree
- ir.model.access
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.access.form
- ir.model.access
-
-
-
-
-
- ir.model.access.search
- ir.model.access
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Access Controls List
- ir.model.access
- form
-
-
-
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Record Rules
- ir.rule
- form
-
-
-
-
-
-
- Property multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
-
-
-
- Server Action
- ir.actions.server
-
-
-
-
-
-
- Server Actions
- ir.actions.server
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.server.search
- ir.actions.server
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server Actions
- ir.actions.act_window
- ir.actions.server
- form
- tree,form
-
-
- {'key':'server_action'}
-
-
-
-
-
-
- ir.actions.todo
- Config Wizard Steps
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.todo
- Config Wizard Steps
-
-
-
-
-
-
- ir.actions.todo
- ir.actions.todo.select
-
-
-
-
-
-
-
-
-
-
- Configuration Wizards
- ir.actions.todo
-
- form
- The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.
-
-
-
-
-
- AutoVacuum osv_memory objects
- 30
- minutes
- -1
- True
-
- osv_memory.autovacuum
- power_on
- ()
-
-
-
-
- ir.mail.server.form
- ir.mail_server
-
-
-
-
-
-
- ir.mail.server.list
- ir.mail_server
-
-
-
-
-
-
-
-
-
-
-
-
- ir.mail.server.search
- ir.mail_server
-
-
-
-
-
-
-
-
-
- Outgoing Mail Servers
- ir.mail_server
- form
- tree,form
-
-
-
-
-
-
-
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
new file mode 100644
index 00000000000..2736f3ea252
--- /dev/null
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -0,0 +1,507 @@
+
+
+
+
+
+ ir.actions.actions
+ ir.actions.actions
+
+
+
+
+
+ ir.actions.actions.tree
+ ir.actions.actions
+
+
+
+
+
+
+
+
+ ir.actions.actions.search
+ ir.actions.actions
+
+
+
+
+
+
+
+
+ Actions
+ ir.actions.act_window
+ ir.actions.actions
+ form
+
+
+
+
+
+
+
+
+
+ ir.actions.report.xml
+ ir.actions.report.xml
+
+
+
+
+
+ ir.actions.report.xml.tree
+ ir.actions.report.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.report.xml.search
+ ir.actions.report.xml
+
+
+
+
+
+
+
+
+
+
+
+ Reports
+ ir.actions.act_window
+ ir.actions.report.xml
+ form
+
+
+
+
+
+
+ ir.actions.windows.tree
+ ir.actions.act_window
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.windows.form
+ ir.actions.act_window
+
+
+
+
+
+ ir.actions.windows.search
+ ir.actions.act_window
+
+
+
+
+
+
+
+
+
+
+
+
+ Window Actions
+ ir.actions.act_window
+ ir.actions.act_window
+ form
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+ ir.actions.wizard.tree
+ ir.actions.wizard
+
+
+
+
+
+
+
+
+
+
+ ir.actions.wizard
+ ir.actions.wizard
+
+
+
+
+
+
+ ir.actions.wizard.search
+ ir.actions.wizard
+
+
+
+
+
+
+
+
+ Wizards
+ ir.actions.act_window
+ ir.actions.wizard
+ form
+
+
+
+
+
+
+
+ Property multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+
+
+ Server Action
+ ir.actions.server
+
+
+
+
+
+
+ Server Actions
+ ir.actions.server
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.server.search
+ ir.actions.server
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server Actions
+ ir.actions.act_window
+ ir.actions.server
+ form
+ tree,form
+
+
+ {'key':'server_action'}
+
+
+
+
+
+
+ ir.actions.todo
+ Config Wizard Steps
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.todo
+ Config Wizard Steps
+
+
+
+
+
+
+ ir.actions.todo
+ ir.actions.todo.select
+
+
+
+
+
+
+
+
+
+
+ Configuration Wizards
+ ir.actions.todo
+
+ form
+ The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_attachment_view.xml b/openerp/addons/base/ir/ir_attachment_view.xml
new file mode 100644
index 00000000000..4a65dd0ad0a
--- /dev/null
+++ b/openerp/addons/base/ir/ir_attachment_view.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attachments
+ ir.actions.act_window
+ ir.attachment
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index e4af6c66bab..72ad43da710 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -1,9 +1,7 @@
-
- ir.config_parameter.search
ir.config_parameter
@@ -13,7 +11,6 @@
- ir.config_parameter.list
ir.config_parameter
@@ -23,7 +20,6 @@
- ir.config_parameter.form
ir.config_parameter
-
diff --git a/openerp/addons/base/ir/ir_cron_view.xml b/openerp/addons/base/ir/ir_cron_view.xml
new file mode 100644
index 00000000000..6a7cef3f1a8
--- /dev/null
+++ b/openerp/addons/base/ir/ir_cron_view.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scheduled Actions
+ ir.cron
+ form
+ tree,form,calendar
+ {'active_test': False}
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index e4b10d41a03..51215132079 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -1,6 +1,5 @@
-
@@ -12,7 +11,6 @@
- ir.filters.form
ir.filters
-
- ir.filters.tree
ir.filters
@@ -44,9 +40,7 @@
-
- ir.filters.search
ir.filters
@@ -62,13 +56,11 @@
-
Filters
ir.actions.act_window
ir.filters
-
diff --git a/openerp/addons/base/ir/ir_mail_server_view.xml b/openerp/addons/base/ir/ir_mail_server_view.xml
new file mode 100644
index 00000000000..ff7b61eaee3
--- /dev/null
+++ b/openerp/addons/base/ir/ir_mail_server_view.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+
+
+
+ Outgoing Mail Servers
+ ir.mail_server
+ form
+ tree,form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 633db6de6a3..e477f2f09a5 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -24,8 +24,11 @@ import re
import time
import types
-from openerp.osv import fields,osv
+import openerp
+from openerp import SUPERUSER_ID
from openerp import netsvc, pooler, tools
+from openerp.osv import fields,osv
+from openerp.osv.orm import Model
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools import config
from openerp.tools.translate import _
@@ -58,7 +61,6 @@ def _in_modules(self, cr, uid, ids, field_name, arg, context=None):
result[k] = ', '.join(sorted(installed_modules & set(xml_id.split('.')[0] for xml_id in v)))
return result
-
class ir_model(osv.osv):
_name = 'ir.model'
_description = "Models"
@@ -204,7 +206,6 @@ class ir_model(osv.osv):
else:
x_name = a._columns.keys()[0]
x_custom_model._rec_name = x_name
-ir_model()
class ir_model_fields(osv.osv):
_name = 'ir.model.fields'
@@ -462,7 +463,128 @@ class ir_model_fields(osv.osv):
obj._auto_init(cr, ctx)
return res
-ir_model_fields()
+class ir_model_constraint(Model):
+ """
+ This model tracks PostgreSQL foreign keys and constraints used by OpenERP
+ models.
+ """
+ _name = 'ir.model.constraint'
+ _columns = {
+ 'name': fields.char('Constraint', required=True, size=128, select=1,
+ help="PostgreSQL constraint or foreign key name."),
+ 'model': fields.many2one('ir.model', string='Model',
+ required=True, select=1),
+ 'module': fields.many2one('ir.module.module', string='Module',
+ required=True, select=1),
+ 'type': fields.char('Constraint Type', required=True, size=1, select=1,
+ help="Type of the constraint: `f` for a foreign key, "
+ "`u` for other constraints."),
+ 'date_update': fields.datetime('Update Date'),
+ 'date_init': fields.datetime('Initialization Date')
+ }
+
+ _sql_constraints = [
+ ('module_name_uniq', 'unique(name, module)',
+ 'Constraints with the same name are unique per module.'),
+ ]
+
+ def _module_data_uninstall(self, cr, uid, ids, context=None):
+ """
+ Delete PostgreSQL foreign keys and constraints tracked by this model.
+ """
+
+ if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
+ raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
+
+ context = dict(context or {})
+
+ ids_set = set(ids)
+ ids.sort()
+ ids.reverse()
+ for data in self.browse(cr, uid, ids, context):
+ model = data.model.model
+ model_obj = self.pool.get(model)
+ name = openerp.tools.ustr(data.name)
+ typ = data.type
+
+ # double-check we are really going to delete all the owners of this schema element
+ cr.execute("""SELECT id from ir_model_constraint where name=%s""", (data.name,))
+ external_ids = [x[0] for x in cr.fetchall()]
+ if (set(external_ids)-ids_set):
+ # as installed modules have defined this element we must not delete it!
+ continue
+
+ if typ == 'f':
+ # test if FK exists on this table (it could be on a related m2m table, in which case we ignore it)
+ cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
+ WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('f', name, model_obj._table))
+ if cr.fetchone():
+ cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
+ _logger.info('Dropped FK CONSTRAINT %s@%s', name, model)
+
+ if typ == 'u':
+ # test if constraint exists
+ cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
+ WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('u', name, model_obj._table))
+ if cr.fetchone():
+ cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
+ _logger.info('Dropped CONSTRAINT %s@%s', name, model)
+
+ self.unlink(cr, uid, ids, context)
+
+class ir_model_relation(Model):
+ """
+ This model tracks PostgreSQL tables used to implement OpenERP many2many
+ relations.
+ """
+ _name = 'ir.model.relation'
+ _columns = {
+ 'name': fields.char('Relation Name', required=True, size=128, select=1,
+ help="PostgreSQL table name implementing a many2many relation."),
+ 'model': fields.many2one('ir.model', string='Model',
+ required=True, select=1),
+ 'module': fields.many2one('ir.module.module', string='Module',
+ required=True, select=1),
+ 'date_update': fields.datetime('Update Date'),
+ 'date_init': fields.datetime('Initialization Date')
+ }
+
+ def _module_data_uninstall(self, cr, uid, ids, context=None):
+ """
+ Delete PostgreSQL many2many relations tracked by this model.
+ """
+
+ if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
+ raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
+
+ ids_set = set(ids)
+ to_drop_table = []
+ ids.sort()
+ ids.reverse()
+ for data in self.browse(cr, uid, ids, context):
+ model = data.model
+ model_obj = self.pool.get(model)
+ name = openerp.tools.ustr(data.name)
+
+ # double-check we are really going to delete all the owners of this schema element
+ cr.execute("""SELECT id from ir_model_relation where name = %s""", (data.name,))
+ external_ids = [x[0] for x in cr.fetchall()]
+ if (set(external_ids)-ids_set):
+ # as installed modules have defined this element we must not delete it!
+ continue
+
+ cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name=%s", (name,))
+ if cr.fetchone() and not name in to_drop_table:
+ to_drop_table.append(name)
+
+ self.unlink(cr, uid, ids, context)
+
+ # drop m2m relation tables
+ for table in to_drop_table:
+ cr.execute('DROP TABLE %s CASCADE'% (table),)
+ _logger.info('Dropped table %s', table)
+
+ cr.commit()
class ir_model_access(osv.osv):
_name = 'ir.model.access'
@@ -643,8 +765,6 @@ class ir_model_access(osv.osv):
res = super(ir_model_access, self).unlink(cr, uid, *args, **argv)
return res
-ir_model_access()
-
class ir_model_data(osv.osv):
"""Holds external identifier keys for records in the database.
This has two main uses:
@@ -978,5 +1098,4 @@ class ir_model_data(osv.osv):
_logger.info('Deleting %s@%s', res_id, model)
self.pool.get(model).unlink(cr, uid, [res_id])
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_model_constraint.py b/openerp/addons/base/ir/ir_model_constraint.py
deleted file mode 100644
index a3099339131..00000000000
--- a/openerp/addons/base/ir/ir_model_constraint.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import logging
-
-import openerp
-from openerp import SUPERUSER_ID
-from openerp.osv import fields
-from openerp.osv.orm import Model
-
-_logger = logging.getLogger(__name__)
-
-class ir_model_constraint(Model):
- """
- This model tracks PostgreSQL foreign keys and constraints used by OpenERP
- models.
- """
- _name = 'ir.model.constraint'
- _columns = {
- 'name': fields.char('Constraint', required=True, size=128, select=1,
- help="PostgreSQL constraint or foreign key name."),
- 'model': fields.many2one('ir.model', string='Model',
- required=True, select=1),
- 'module': fields.many2one('ir.module.module', string='Module',
- required=True, select=1),
- 'type': fields.char('Constraint Type', required=True, size=1, select=1,
- help="Type of the constraint: `f` for a foreign key, "
- "`u` for other constraints."),
- 'date_update': fields.datetime('Update Date'),
- 'date_init': fields.datetime('Initialization Date')
- }
-
- _sql_constraints = [
- ('module_name_uniq', 'unique(name, module)',
- 'Constraints with the same name are unique per module.'),
- ]
-
- def _module_data_uninstall(self, cr, uid, ids, context=None):
- """
- Delete PostgreSQL foreign keys and constraints tracked by this model.
- """
-
- if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
- raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
-
- context = dict(context or {})
-
- ids_set = set(ids)
- ids.sort()
- ids.reverse()
- for data in self.browse(cr, uid, ids, context):
- model = data.model.model
- model_obj = self.pool.get(model)
- name = openerp.tools.ustr(data.name)
- typ = data.type
-
- # double-check we are really going to delete all the owners of this schema element
- cr.execute("""SELECT id from ir_model_constraint where name=%s""", (data.name,))
- external_ids = [x[0] for x in cr.fetchall()]
- if (set(external_ids)-ids_set):
- # as installed modules have defined this element we must not delete it!
- continue
-
- if typ == 'f':
- # test if FK exists on this table (it could be on a related m2m table, in which case we ignore it)
- cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
- WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('f', name, model_obj._table))
- if cr.fetchone():
- cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
- _logger.info('Dropped FK CONSTRAINT %s@%s', name, model)
-
- if typ == 'u':
- # test if constraint exists
- cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
- WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('u', name, model_obj._table))
- if cr.fetchone():
- cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
- _logger.info('Dropped CONSTRAINT %s@%s', name, model)
-
- self.unlink(cr, uid, ids, context)
diff --git a/openerp/addons/base/ir/ir_model_relation.py b/openerp/addons/base/ir/ir_model_relation.py
deleted file mode 100644
index fc6dae2ca52..00000000000
--- a/openerp/addons/base/ir/ir_model_relation.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import logging
-
-import openerp
-from openerp import SUPERUSER_ID
-from openerp.osv import fields
-from openerp.osv.orm import Model
-
-_logger = logging.getLogger(__name__)
-
-class ir_model_relation(Model):
- """
- This model tracks PostgreSQL tables used to implement OpenERP many2many
- relations.
- """
- _name = 'ir.model.relation'
- _columns = {
- 'name': fields.char('Relation Name', required=True, size=128, select=1,
- help="PostgreSQL table name implementing a many2many relation."),
- 'model': fields.many2one('ir.model', string='Model',
- required=True, select=1),
- 'module': fields.many2one('ir.module.module', string='Module',
- required=True, select=1),
- 'date_update': fields.datetime('Update Date'),
- 'date_init': fields.datetime('Initialization Date')
- }
-
- def _module_data_uninstall(self, cr, uid, ids, context=None):
- """
- Delete PostgreSQL many2many relations tracked by this model.
- """
-
- if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
- raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
-
- ids_set = set(ids)
- to_drop_table = []
- ids.sort()
- ids.reverse()
- for data in self.browse(cr, uid, ids, context):
- model = data.model
- model_obj = self.pool.get(model)
- name = openerp.tools.ustr(data.name)
-
- # double-check we are really going to delete all the owners of this schema element
- cr.execute("""SELECT id from ir_model_relation where name = %s""", (data.name,))
- external_ids = [x[0] for x in cr.fetchall()]
- if (set(external_ids)-ids_set):
- # as installed modules have defined this element we must not delete it!
- continue
-
- cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name=%s", (name,))
- if cr.fetchone() and not name in to_drop_table:
- to_drop_table.append(name)
-
- self.unlink(cr, uid, ids, context)
-
- # drop m2m relation tables
- for table in to_drop_table:
- cr.execute('DROP TABLE %s CASCADE'% (table),)
- _logger.info('Dropped table %s', table)
-
- cr.commit()
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
new file mode 100644
index 00000000000..01ff918662f
--- /dev/null
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -0,0 +1,416 @@
+
+
+
+
+
+ ir.model
+
+
+
+
+
+ ir.model
+
+
+
+
+
+
+
+
+
+
+ ir.model
+
+
+
+
+
+
+
+
+
+
+
+ Models
+ ir.model
+ form
+ {'manual':True}
+
+
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fields
+ ir.model.fields
+ form
+ {'manual':True}
+
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ External Identifiers
+ ir.model.data
+ form
+
+
+
+
+
+
+
+ ir.model.constraint
+
+
+
+
+
+ ir.model.constraint
+
+
+
+
+
+
+
+
+
+
+ Model Constraints
+ ir.model.constraint
+ form
+
+
+
+
+
+
+ ir.model.relation
+
+
+
+
+
+ ir.model.relation
+
+
+
+
+
+
+
+
+
+ ManyToMany Relations
+ ir.model.relation
+ form
+
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Access Controls List
+ ir.model.access
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_rule_view.xml b/openerp/addons/base/ir/ir_rule_view.xml
new file mode 100644
index 00000000000..f67df822876
--- /dev/null
+++ b/openerp/addons/base/ir/ir_rule_view.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Record Rules
+ ir.rule
+ form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_sequence_view.xml b/openerp/addons/base/ir/ir_sequence_view.xml
new file mode 100644
index 00000000000..0fa46d61957
--- /dev/null
+++ b/openerp/addons/base/ir/ir_sequence_view.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+
+
+
+
+ Sequences
+ ir.actions.act_window
+ ir.sequence
+ form
+
+ {'active_test': False}
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+
+
+ Sequence Codes
+ ir.actions.act_window
+ ir.sequence.type
+ form
+ tree,form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_translation_view.xml b/openerp/addons/base/ir/ir_translation_view.xml
index 70ccb902cc9..5555b371c58 100644
--- a/openerp/addons/base/ir/ir_translation_view.xml
+++ b/openerp/addons/base/ir/ir_translation_view.xml
@@ -1,8 +1,8 @@
+
- Translations
ir.translation
@@ -21,7 +21,6 @@
- Translations
ir.translation
- Translations
ir.translation
@@ -76,4 +74,4 @@
-
\ No newline at end of file
+
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 213cff18cc6..5ab546cb554 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -316,9 +316,5 @@ class ir_ui_menu(osv.osv):
'sequence' : 10,
}
_order = "sequence,id"
-ir_ui_menu()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/openerp/addons/base/ir/ir_ui_menu_view.xml b/openerp/addons/base/ir/ir_ui_menu_view.xml
new file mode 100644
index 00000000000..406f75b3d22
--- /dev/null
+++ b/openerp/addons/base/ir/ir_ui_menu_view.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 9208297cf84..868f634783c 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -44,7 +44,6 @@ class view_custom(osv.osv):
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_custom_user_id_ref_id\'')
if not cr.fetchone():
cr.execute('CREATE INDEX ir_ui_view_custom_user_id_ref_id ON ir_ui_view_custom (user_id, ref_id)')
-view_custom()
class view(osv.osv):
_name = 'ir.ui.view'
@@ -60,7 +59,7 @@ class view(osv.osv):
return result
_columns = {
- 'name': fields.char('View Name',size=64, required=True),
+ 'name': fields.char('View Name', required=True),
'model': fields.char('Object', size=64, required=True, select=True),
'priority': fields.integer('Sequence', required=True),
'type': fields.function(_type_field, type='selection', selection=[
@@ -88,11 +87,17 @@ class view(osv.osv):
_order = "priority,name"
# Holds the RNG schema
- _relaxng_validator = None
+ _relaxng_validator = None
def create(self, cr, uid, values, context=None):
if 'type' in values:
_logger.warning("Setting the `type` field is deprecated in the `ir.ui.view` model.")
+ if not values.get('name'):
+ if values.get('inherit_id'):
+ inferred_type = self.browse(cr, uid, values['inherit_id'], context).type
+ else:
+ inferred_type = etree.fromstring(values['arch'].encode('utf8')).tag
+ values['name'] = "%s %s" % (values['model'], inferred_type)
return super(osv.osv, self).create(cr, uid, values, context)
def _relaxng(self):
@@ -106,8 +111,7 @@ class view(osv.osv):
finally:
frng.close()
return self._relaxng_validator
-
-
+
def _check_render_view(self, cr, uid, view, context=None):
"""Verify that the given view's hierarchy is valid for rendering, along with all the changes applied by
its inherited views, by rendering it using ``fields_view_get()``.
@@ -267,7 +271,6 @@ class view(osv.osv):
'label' : labels,
'blank_nodes': blank_nodes,
'node_parent_field': _Model_Field,}
-view()
class view_sc(osv.osv):
_name = 'ir.ui.view_sc'
@@ -304,7 +307,5 @@ class view_sc(osv.osv):
('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
]
-view_sc()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_view_view.xml b/openerp/addons/base/ir/ir_ui_view_view.xml
new file mode 100644
index 00000000000..59dfdd72b3f
--- /dev/null
+++ b/openerp/addons/base/ir/ir_ui_view_view.xml
@@ -0,0 +1,144 @@
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Views
+ ir.actions.act_window
+ ir.ui.view
+
+ Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need.
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+
+
+
+ Customized Views
+ ir.actions.act_window
+ ir.ui.view.custom
+ Customized views are used when users reorganize the content of their dashboard views (via web client)
+
+
+
+
+
+ ir.ui.view_sc
+
+
+
+
+
+ ir.ui.view_sc
+
+
+
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_values_view.xml b/openerp/addons/base/ir/ir_values_view.xml
new file mode 100644
index 00000000000..57457e4e9a3
--- /dev/null
+++ b/openerp/addons/base/ir/ir_values_view.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+ ir.values.form.action
+ ir.values
+
+
+
+
+
+
+ ir.values.form.defaults
+ ir.values
+
+
+
+
+
+
+ ir.values.tree.action
+ ir.values
+
+
+
+
+
+
+
+
+
+
+ ir.values.search.action
+ ir.values
+
+
+
+
+
+
+
+
+
+
+
+
+ Action Bindings
+ ir.actions.act_window
+ ir.values
+ form
+ tree,form
+
+ [('key','=','action')]
+ {'default_key':'action'}
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+ User-defined Defaults
+ ir.actions.act_window
+ ir.values
+ form
+ tree,form
+
+ [('key','=','default')]
+ {'default_key':'default','default_key2':''}
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/osv_memory_autovacuum.xml b/openerp/addons/base/ir/osv_memory_autovacuum.xml
new file mode 100644
index 00000000000..079a33c3e5c
--- /dev/null
+++ b/openerp/addons/base/ir/osv_memory_autovacuum.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ AutoVacuum osv_memory objects
+ 30
+ minutes
+ -1
+ True
+
+ osv_memory.autovacuum
+ power_on
+ ()
+
+
+
+