From 87f863a8a9687b1824618c285cac668d695aebe0 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 19 May 2011 14:15:33 +0530 Subject: [PATCH 1/4] [IMP]Base : Remove Create Users conf wiz bzr revid: aag@tinyerp.co.in-20110519084533-2a3q4l7ve6bxvege --- openerp/addons/base/base_update.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index dc3b34c710f..5dfd6f29fb8 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -309,16 +309,6 @@ - - Create Users - ir.actions.act_window - res.config.users - form - form - - new - - Configure Your Interface res.config.view @@ -360,12 +350,6 @@ new - - - 10 - normal - done - special From 0a64359a6ee2760af5379d7a58d50ad4ec398132 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 19 May 2011 16:12:40 +0530 Subject: [PATCH 2/4] [IMP]Base :add a new field category on config wizard bzr revid: aag@tinyerp.co.in-20110519104240-4l4v9keihok6xzmp --- openerp/addons/base/ir/ir.xml | 25 +++++++++++++++++++++++++ openerp/addons/base/ir/ir_actions.py | 9 +++++++++ 2 files changed, 34 insertions(+) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 2877370b4bb..f38ebcfc1ba 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -1899,6 +1899,7 @@ + @@ -1953,6 +1954,30 @@ power_on () + + + todo.category.form + todo.category + form + +
+ + + + +
+ + + todo.category.tree + todo.category + tree + + + + + + + diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index c64039e9f81..2683effe768 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -800,6 +800,14 @@ class act_window_close(osv.osv): } act_window_close() +class todo_category(osv.osv): + _name = 'todo.category' + _columns = { + 'name':fields.char('Name', size=64), + 'sequence': fields.integer('Sequence'), + } +todo_category() + # This model use to register action services. TODO_STATES = [('open', 'To Do'), ('done', 'Done'), @@ -818,6 +826,7 @@ class ir_actions_todo(osv.osv): 'type': fields.selection([('special','Special'),('normal','Normal'),('normal_recurring','Normal Recurring')],'Type',required=True), 'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'), 'note':fields.text('Text', translate=True), + 'category_id': fields.many2one('todo.category','Category'), } _defaults={ 'state': 'open', From 1f800291fa2724d5bf8d75773e32e7602c3b969e Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 20 May 2011 11:09:10 +0530 Subject: [PATCH 3/4] [IMP]Base:Change name of Category Obj and put name field as required bzr revid: aag@tinyerp.co.in-20110520053910-71b9sl1slepqid74 --- openerp/addons/base/ir/ir.xml | 12 ++++++------ openerp/addons/base/ir/ir_actions.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index f38ebcfc1ba..7e07350032e 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -1955,9 +1955,9 @@ () - - todo.category.form - todo.category + + ir.actions.todo.category.form + ir.actions.todo.category form
@@ -1967,9 +1967,9 @@ - - todo.category.tree - todo.category + + ir.actions.todo.category.tree + ir.actions.todo.category tree diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 2683effe768..4fe50bc8edd 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -800,13 +800,13 @@ class act_window_close(osv.osv): } act_window_close() -class todo_category(osv.osv): - _name = 'todo.category' +class ir_actions_todo_category(osv.osv): + _name = 'ir.actions.todo.category' _columns = { - 'name':fields.char('Name', size=64), + 'name':fields.char('Name', size=64, required=True), 'sequence': fields.integer('Sequence'), } -todo_category() +ir_actions_todo_category() # This model use to register action services. TODO_STATES = [('open', 'To Do'), @@ -826,7 +826,7 @@ class ir_actions_todo(osv.osv): 'type': fields.selection([('special','Special'),('normal','Normal'),('normal_recurring','Normal Recurring')],'Type',required=True), 'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'), 'note':fields.text('Text', translate=True), - 'category_id': fields.many2one('todo.category','Category'), + 'category_id': fields.many2one('ir.actions.todo.category','Category'), } _defaults={ 'state': 'open', From 9bc6ab5829d098bc2202b13f7037f34fcd576517 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 20 May 2011 11:28:01 +0530 Subject: [PATCH 4/4] [IMP]Base:Remove Create Users cinfig wiz view and obj also bzr revid: aag@tinyerp.co.in-20110520055801-9gj7wmkni6pz3nh9 --- openerp/addons/base/base_update.xml | 62 ----------------------------- openerp/addons/base/res/res_user.py | 52 ------------------------ 2 files changed, 114 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 5dfd6f29fb8..0d9f12c2c09 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -247,68 +247,6 @@ - - res.config.users.confirm.form - res.config.users - form - - - - - Create User - - - New User - - - Create additional users and assign them groups that will allow them to have access to selected functionalities within the system. Click on 'Done' if you do not wish to add more users at this stage, you can always do this later. - - - - - - - - - - - - - - - - - action_add - Add User - gtk-add - - - - - action_next - Done - gtk-go-forward - - - - - Configure Your Interface res.config.view diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index 261ec699659..db180ed6de6 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -508,58 +508,6 @@ class users(osv.osv): users() -class config_users(osv.osv_memory): - _name = 'res.config.users' - _inherit = ['res.users', 'res.config'] - - def _generate_signature(self, cr, name, email, context=None): - return _('--\n%(name)s %(email)s\n') % { - 'name': name or '', - 'email': email and ' <'+email+'>' or '', - } - - def create_user(self, cr, uid, new_id, context=None): - """ create a new res.user instance from the data stored - in the current res.config.users. - - If an email address was filled in for the user, sends a mail - composed of the return values of ``get_welcome_mail_subject`` - and ``get_welcome_mail_body`` (which should be unicode values), - with the user's data %-formatted into the mail body - """ - base_data = self.read(cr, uid, new_id, context=context) - partner_id = self.pool.get('res.partner').main_partner(cr, uid) - address = self.pool.get('res.partner.address').create( - cr, uid, {'name': base_data['name'], - 'email': base_data['email'], - 'partner_id': partner_id,}, - context) - user_data = dict( - base_data, - signature=self._generate_signature( - cr, base_data['name'], base_data['email'], context=context), - address_id=address, - ) - new_user = self.pool.get('res.users').create( - cr, uid, user_data, context) - self.send_welcome_email(cr, uid, new_user, context=context) - def execute(self, cr, uid, ids, context=None): - 'Do nothing on execution, just launch the next action/todo' - pass - def action_add(self, cr, uid, ids, context=None): - 'Create a user, and re-display the view' - self.create_user(cr, uid, ids[0], context=context) - return { - 'view_type': 'form', - "view_mode": 'form', - 'res_model': 'res.config.users', - 'view_id':self.pool.get('ir.ui.view')\ - .search(cr,uid,[('name','=','res.config.users.confirm.form')]), - 'type': 'ir.actions.act_window', - 'target':'new', - } -config_users() - class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ? _inherit = 'res.groups' _columns = {