From 4e4e10b4c96b590d09f9c5adb9a61f537aa8ca97 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 21 Aug 2008 15:49:55 +0200 Subject: [PATCH] Renamed Model to Object bzr revid: fp@tinyerp.com-20080821134955-iuoq8kwn17i6u4gn --- bin/addons/base/ir/ir_actions.py | 10 +++++----- bin/addons/base/ir/ir_attachment.py | 2 +- bin/addons/base/ir/ir_cron.py | 2 +- bin/addons/base/ir/ir_default.py | 4 ++-- bin/addons/base/ir/ir_model.py | 12 ++++++------ bin/addons/base/ir/ir_report_custom.py | 2 +- bin/addons/base/ir/ir_rule.py | 2 +- bin/addons/base/ir/ir_translation.py | 2 +- bin/addons/base/ir/ir_ui_view.py | 2 +- bin/addons/base/ir/ir_values.py | 2 +- bin/addons/base/ir/wizard/wizard_menu.py | 2 +- bin/addons/base/ir/workflow/workflow.py | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 806f129994f..a343350ea0f 100755 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -55,7 +55,7 @@ class report_custom(osv.osv): _columns = { 'name': fields.char('Report Name', size=64, required=True, translate=True), 'type': fields.char('Report Type', size=32, required=True), - 'model':fields.char('Model', size=64, required=True), + 'model':fields.char('Object', size=64, required=True), 'report_id': fields.integer('Report Ref.', required=True), 'usage': fields.char('Action Usage', size=32), 'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form views.") @@ -99,7 +99,7 @@ class report_xml(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), 'type': fields.char('Report Type', size=32, required=True), - 'model': fields.char('Model', size=64, required=True), + 'model': fields.char('Object', size=64, required=True), 'report_name': fields.char('Internal Name', size=64, required=True), 'report_xsl': fields.char('XSL path', size=256), 'report_xml': fields.char('XML path', size=256), @@ -173,8 +173,8 @@ class act_window(osv.osv): 'view_id': fields.many2one('ir.ui.view', 'View Ref.', ondelete='cascade'), 'domain': fields.char('Domain Value', size=250), 'context': fields.char('Context Value', size=250), - 'res_model': fields.char('Model', size=64), - 'src_model': fields.char('Source model', size=64), + 'res_model': fields.char('Object', size=64), + 'src_model': fields.char('Source Object', size=64), 'target': fields.selection([('current','Current Window'),('new','New Window')], 'Target Window'), 'view_type': fields.selection((('tree','Tree'),('form','Form')),string='Type of view'), 'view_mode': fields.char('Mode of view', size=250), @@ -353,7 +353,7 @@ class actions_server(osv.osv): ], 'Action State', required=True, size=32, change_default=True), 'code': fields.text('Python Code'), 'sequence': fields.integer('Sequence'), - 'model_id': fields.many2one('ir.model', 'Model', required=True), + 'model_id': fields.many2one('ir.model', 'Object', required=True), 'trigger_name': fields.char('Trigger Name', size=128), 'trigger_obj_id': fields.reference('Trigger On', selection=model_get, size=128), #'trigger_object': fields.char('Trigger Object', size=128), diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py index 26bc0b7bf15..acf3fc3d575 100644 --- a/bin/addons/base/ir/ir_attachment.py +++ b/bin/addons/base/ir/ir_attachment.py @@ -38,7 +38,7 @@ class ir_attachment(osv.osv): 'datas_fname': fields.char('Data Filename',size=64), 'description': fields.text('Description'), # Not required due to the document module ! - 'res_model': fields.char('Resource Model',size=64, readonly=True), + 'res_model': fields.char('Resource Object',size=64, readonly=True), 'res_id': fields.integer('Resource ID', readonly=True), 'link': fields.char('Link', size=256) } diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py index eb9fc99c1c3..6b7208fe140 100644 --- a/bin/addons/base/ir/ir_cron.py +++ b/bin/addons/base/ir/ir_cron.py @@ -68,7 +68,7 @@ class ir_cron(osv.osv, netsvc.Agent): 'numbercall': fields.integer('Number of calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'), 'doall' : fields.boolean('Repeat missed'), 'nextcall' : fields.datetime('Next call date', required=True), - 'model': fields.char('Model', size=64), + 'model': fields.char('Object', size=64), 'function': fields.char('Function', size=64), 'args': fields.text('Arguments'), 'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent') diff --git a/bin/addons/base/ir/ir_default.py b/bin/addons/base/ir/ir_default.py index 4d9809cfe57..669210e54ac 100644 --- a/bin/addons/base/ir/ir_default.py +++ b/bin/addons/base/ir/ir_default.py @@ -33,8 +33,8 @@ from osv import fields,osv class ir_default(osv.osv): _name = 'ir.default' _columns = { - 'field_tbl': fields.char('Model',size=64), - 'field_name': fields.char('Model field',size=64), + 'field_tbl': fields.char('Object',size=64), + 'field_name': fields.char('Object field',size=64), 'value': fields.char('Default Value',size=64), 'uid': fields.many2one('res.users', 'Users'), 'page': fields.char('View',size=64), diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py index 0899cfde2fb..d58c2e0950c 100644 --- a/bin/addons/base/ir/ir_model.py +++ b/bin/addons/base/ir/ir_model.py @@ -46,7 +46,7 @@ class ir_model(osv.osv): _description = "Objects" _rec_name = 'name' _columns = { - 'name': fields.char('Model Name', size=64, translate=True, required=True), + 'name': fields.char('Object Name', size=64, translate=True, required=True), 'model': fields.char('Object Name', size=64, required=True, search=1), 'info': fields.text('Information'), 'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True), @@ -67,7 +67,7 @@ class ir_model(osv.osv): return True _constraints = [ - (_check_model_name, 'The model name must start with x_ and not contain any special character !', ['model']), + (_check_model_name, 'The Object name must start with x_ and not contain any special character !', ['model']), ] def unlink(self, cr, user, ids, context=None): for model in self.browse(cr, user, ids, context): @@ -103,8 +103,8 @@ class ir_model_fields(osv.osv): _columns = { 'name': fields.char('Name', required=True, size=64, select=1), 'model': fields.char('Object Name', size=64, required=True), - 'relation': fields.char('Model Relation', size=64), - 'model_id': fields.many2one('ir.model', 'Model id', required=True, select=True, ondelete='cascade'), + 'relation': fields.char('Object Relation', size=64), + 'model_id': fields.many2one('ir.model', 'Object id', required=True, select=True, ondelete='cascade'), 'field_description': fields.char('Field Label', required=True, size=256), 'relate': fields.boolean('Click and Relate'), @@ -164,7 +164,7 @@ class ir_model_access(osv.osv): _name = 'ir.model.access' _columns = { 'name': fields.char('Name', size=64, required=True), - 'model_id': fields.many2one('ir.model', 'Model', required=True), + 'model_id': fields.many2one('ir.model', 'Object', required=True), 'group_id': fields.many2one('res.groups', 'Group'), 'perm_read': fields.boolean('Read Access'), 'perm_write': fields.boolean('Write Access'), @@ -244,7 +244,7 @@ class ir_model_data(osv.osv): _name = 'ir.model.data' _columns = { 'name': fields.char('XML Identifier', required=True, size=64), - 'model': fields.char('Model', required=True, size=64), + 'model': fields.char('Object', required=True, size=64), 'module': fields.char('Module', required=True, size=64), 'res_id': fields.integer('Resource ID'), 'noupdate': fields.boolean('Non Updatable'), diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py index 7c0f33809ba..1d0dddd3a37 100644 --- a/bin/addons/base/ir/ir_report_custom.py +++ b/bin/addons/base/ir/ir_report_custom.py @@ -38,7 +38,7 @@ class report_custom(osv.osv): _name = 'ir.report.custom' _columns = { 'name': fields.char('Report Name', size=64, required=True, translate=True), - 'model_id': fields.many2one('ir.model','Model', required=True, change_default=True), + 'model_id': fields.many2one('ir.model','Object', required=True, change_default=True), 'type': fields.selection([('table','Tabular'),('pie','Pie Chart'),('bar','Bar Chart'),('line','Line Plot')], "Report Type", size=64, required='True'), 'title': fields.char("Report title", size=64, required='True', translate=True), 'print_format': fields.selection((('A4','a4'),('A5','a5')), 'Print format', required=True), diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py index f63a6cc3193..fb00523c725 100644 --- a/bin/addons/base/ir/ir_rule.py +++ b/bin/addons/base/ir/ir_rule.py @@ -38,7 +38,7 @@ class ir_rule_group(osv.osv): _columns = { 'name': fields.char('Name', size=128, select=1), - 'model_id': fields.many2one('ir.model', 'Model',select=1, required=True), + 'model_id': fields.many2one('ir.model', 'Object',select=1, required=True), 'global': fields.boolean('Global', select=1, help="Make the rule global or it needs to be put on a group or user"), 'rules': fields.one2many('ir.rule', 'rule_group', 'Tests', help="The rule is satisfied if at least one test is True"), 'groups': fields.many2many('res.groups', 'group_rule_group_rel', 'rule_group_id', 'group_id', 'Groups'), diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py index efbe5babd9b..b0c15f5e319 100644 --- a/bin/addons/base/ir/ir_translation.py +++ b/bin/addons/base/ir/ir_translation.py @@ -34,7 +34,7 @@ import tools TRANSLATION_TYPE = [ ('field', 'Field'), - ('model', 'Model'), + ('model', 'Object'), ('rml', 'RML'), ('selection', 'Selection'), ('view', 'View'), diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py index 6bf326bd33e..b61ad0b9668 100644 --- a/bin/addons/base/ir/ir_ui_view.py +++ b/bin/addons/base/ir/ir_ui_view.py @@ -60,7 +60,7 @@ class view(osv.osv): _name = 'ir.ui.view' _columns = { 'name': fields.char('View Name',size=64, required=True), - 'model': fields.char('Model', size=64, required=True), + 'model': fields.char('Object', size=64, required=True), 'priority': fields.integer('Priority', required=True), 'type': fields.selection(( ('tree','Tree'), diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py index 1fd086eb117..ee864e2f225 100644 --- a/bin/addons/base/ir/ir_values.py +++ b/bin/addons/base/ir/ir_values.py @@ -59,7 +59,7 @@ class ir_values(osv.osv): _columns = { 'name': fields.char('Name', size=128), - 'model': fields.char('Model', size=128), + 'model': fields.char('Object', size=128), 'value': fields.text('Value'), 'value_unpickle': fields.function(_value_unpickle, fnct_inv=_value_pickle, method=True, type='text', string='Value'), diff --git a/bin/addons/base/ir/wizard/wizard_menu.py b/bin/addons/base/ir/wizard/wizard_menu.py index 4260c1d2289..3724b1dd4e5 100644 --- a/bin/addons/base/ir/wizard/wizard_menu.py +++ b/bin/addons/base/ir/wizard/wizard_menu.py @@ -33,7 +33,7 @@ from osv import fields,osv class wizard_model_menu(osv.osv_memory): _name = 'wizard.ir.model.menu.create' _columns = { - 'model_id': fields.many2one('ir.model','Model', required=True), + 'model_id': fields.many2one('ir.model','Object', required=True), 'menu_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 'name': fields.char('Menu Name', size=64, required=True), 'view_ids': fields.one2many('wizard.ir.model.menu.create.line', 'wizard_id', 'Views'), diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index 019c92100de..8b90cfee140 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -38,7 +38,7 @@ class workflow(osv.osv): _log_access = False _columns = { 'name': fields.char('Name', size=64, required=True), - 'osv': fields.char('Resource Model', size=64, required=True,select=True), + 'osv': fields.char('Resource Object', size=64, required=True,select=True), 'on_create': fields.boolean('On Create', select=True), 'activities': fields.one2many('workflow.activity', 'wkf_id', 'Activities'), } @@ -145,7 +145,7 @@ class wkf_instance(osv.osv): 'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='restrict', select=True), 'uid': fields.integer('User ID'), 'res_id': fields.integer('Resource ID', select=True), - 'res_type': fields.char('Resource Model', size=64, select=True), + 'res_type': fields.char('Resource Object', size=64, select=True), 'state': fields.char('State', size=32, select=True), } def _auto_init(self, cr, context={}): @@ -180,7 +180,7 @@ class wkf_triggers(osv.osv): _log_access = False _columns = { 'res_id': fields.integer('Resource ID', size=128), - 'model': fields.char('Model', size=128), + 'model': fields.char('Object', size=128), 'instance_id': fields.many2one('workflow.instance', 'Destination Instance', ondelete="cascade"), 'workitem_id': fields.many2one('workflow.workitem', 'Workitem', required=True, ondelete="cascade"), }