Merge lp:~unifield-team/unifield-server/uf-1267 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2012-08-09 14:11:55 +0000
+++ bin/addons/base/ir/ir_actions.py	2012-09-10 15:46:26 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 from tools.safe_eval import safe_eval as eval
 import tools
 import time
@@ -39,7 +39,7 @@
     _order = 'name'
     _columns = {
         'name': fields.char('Action Name', required=True, size=64),
-        'type': fields.char('Action Type', required=True, size=32,readonly=True),
+        'type': fields.char('Action Type', required=True, size=32, readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }
     _defaults = {
@@ -68,7 +68,7 @@
         return res
 
     def _report_content_inv(self, cursor, user, id, name, value, arg, context=None):
-        self.write(cursor, user, id, {name+'_data': value}, context=context)
+        self.write(cursor, user, id, {name + '_data': value}, context=context)
 
     def _report_sxw(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -90,15 +90,15 @@
         result = cr.dictfetchall()
         svcs = netsvc.Service._services
         for r in result:
-            if svcs.has_key('report.'+r['report_name']):
+            if svcs.has_key('report.' + r['report_name']):
                 continue
             if r['report_rml'] or r['report_rml_content_data']:
-                report_sxw('report.'+r['report_name'], r['model'],
-                        opj('addons',r['report_rml'] or '/'), header=r['header'])
+                report_sxw('report.' + r['report_name'], r['model'],
+                        opj('addons', r['report_rml'] or '/'), header=r['header'])
             if r['report_xsl']:
-                report_rml('report.'+r['report_name'], r['model'],
-                        opj('addons',r['report_xml']),
-                        r['report_xsl'] and opj('addons',r['report_xsl']))
+                report_rml('report.' + r['report_name'], r['model'],
+                        opj('addons', r['report_xml']),
+                        r['report_xsl'] and opj('addons', r['report_xsl']))
 
     _name = 'ir.actions.report.xml'
     _table = 'ir_act_report_xml'
@@ -164,15 +164,15 @@
         return _('Invalid model name in the action definition.')
     
     _constraints = [
-        (_check_model, _invalid_model_msg, ['res_model','src_model'])
+        (_check_model, _invalid_model_msg, ['res_model', 'src_model'])
     ]
 
     def _views_get_fnc(self, cr, uid, ids, name, arg, context=None):
-        res={}
+        res = {}
         for act in self.browse(cr, uid, ids):
-            res[act.id]=[(view.view_id.id, view.view_mode) for view in act.view_ids]
+            res[act.id] = [(view.view_id.id, view.view_mode) for view in act.view_ids]
             modes = act.view_mode.split(',')
-            if len(modes)>len(act.view_ids):
+            if len(modes) > len(act.view_ids):
                 find = False
                 if act.view_id:
                     res[act.id].append((act.view_id.id, act.view_id.type))
@@ -195,9 +195,9 @@
             if act.search_view_id:
                 search_view_id = act.search_view_id.id
             else:
-                res_view = self.pool.get('ir.ui.view').search(cr, uid, 
-                        [('model','=',act.res_model),('type','=','search'),
-                        ('inherit_id','=',False)], context=context)
+                res_view = self.pool.get('ir.ui.view').search(cr, uid,
+                        [('model', '=', act.res_model), ('type', '=', 'search'),
+                        ('inherit_id', '=', False)], context=context)
                 if res_view:
                     search_view_id = res_view[0]
             if search_view_id:
@@ -209,8 +209,8 @@
             else:
                 def process_child(node, new_node, doc):
                     for child in node.childNodes:
-                        if child.localName=='field' and child.hasAttribute('select') \
-                                and child.getAttribute('select')=='1':
+                        if child.localName == 'field' and child.hasAttribute('select') \
+                                and child.getAttribute('select') == '1':
                             if child.childNodes:
                                 fld = doc.createElement('field')
                                 for attr in child.attributes.keys():
@@ -218,7 +218,7 @@
                                 new_node.appendChild(fld)
                             else:
                                 new_node.appendChild(child)
-                        elif child.localName in ('page','group','notebook'):
+                        elif child.localName in ('page', 'group', 'notebook'):
                             process_child(child, new_node, doc)
 
                 form_arch = self.pool.get(act.res_model).fields_view_get(cr, uid, False, 'form', context)
@@ -227,7 +227,7 @@
                 for child_node in new_node.childNodes[0].childNodes:
                     if child_node.nodeType == child_node.ELEMENT_NODE:
                         new_node.childNodes[0].removeChild(child_node)
-                process_child(dom_arc.childNodes[0],new_node.childNodes[0],dom_arc)
+                process_child(dom_arc.childNodes[0], new_node.childNodes[0], dom_arc)
 
                 form_arch['arch'] = new_node.toxml()
                 form_arch['fields'].update(fields_from_fields_get)
@@ -250,8 +250,8 @@
             help="Model name of the object to open in the view window"),
         'src_model': fields.char('Source Object', size=64,
             help="Optional model name of the objects on which this action should be visible"),
-        'target': fields.selection([('current','Current Window'),('new','New Window')], 'Target Window'),
-        'view_type': fields.selection((('tree','Tree'),('form','Form')), string='View Type', required=True,
+        'target': fields.selection([('current', 'Current Window'), ('new', 'New Window')], 'Target Window'),
+        'view_type': fields.selection((('tree', 'Tree'), ('form', 'Form')), string='View Type', required=True,
             help="View type: set to 'tree' for a hierarchical tree view, or 'form' for other views"),
         'view_mode': fields.char('View Mode', size=250, required=True,
             help="Comma-separated list of allowed view modes, such as 'form', 'tree', 'calendar', etc. (Default: tree,form)"),
@@ -356,7 +356,7 @@
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
-        'url': fields.text('Action URL',required=True),
+        'url': fields.text('Action URL', required=True),
         'target': fields.selection((
             ('new', 'New Window'),
             ('self', 'This Window')),
@@ -378,7 +378,7 @@
     mpool = self.pool.get('ir.model')
     for osv in osvs:
         model = osv.get('osv')
-        id = mpool.search(cr, uid, [('model','=',model)])
+        id = mpool.search(cr, uid, [('model', '=', model)])
         name = mpool.read(cr, uid, id)[0]['name']
         res.append((model, name))
 
@@ -400,8 +400,8 @@
         'col1': fields.many2one('ir.model.fields', 'Destination', required=True),
         'value': fields.text('Value', required=True),
         'type': fields.selection([
-            ('value','Value'),
-            ('equation','Formula')
+            ('value', 'Value'),
+            ('equation', 'Formula')
         ], 'Type', required=True, size=32, change_default=True),
     }
     _defaults = {
@@ -428,15 +428,15 @@
 
     def _select_objects(self, cr, uid, context=None):
         model_pool = self.pool.get('ir.model')
-        ids = model_pool.search(cr, uid, [('name','not ilike','.')])
+        ids = model_pool.search(cr, uid, [('name', 'not ilike', '.')])
         res = model_pool.read(cr, uid, ids, ['model', 'name'])
-        return [(r['model'], r['name']) for r in res] +  [('','')]
+        return [(r['model'], r['name']) for r in res] + [('', '')]
 
     def change_object(self, cr, uid, ids, copy_object, state, context=None):
         if state == 'object_copy':
             model_pool = self.pool.get('ir.model')
             model = copy_object.split(',')[0]
-            mid = model_pool.search(cr, uid, [('model','=',model)])
+            mid = model_pool.search(cr, uid, [('model', '=', model)])
             return {
                 'value':{'srcmodel_id':mid[0]},
                 'context':context
@@ -452,17 +452,17 @@
         'name': fields.char('Action Name', required=True, size=64, help="Easy to Refer action by name e.g. One Sales Order -> Many Invoices", translate=True),
         'condition' : fields.char('Condition', size=256, required=True, help="Condition that is to be tested before action is executed, e.g. object.list_price > object.cost_price"),
         'state': fields.selection([
-            ('client_action','Client Action'),
-            ('dummy','Dummy'),
-            ('loop','Iteration'),
-            ('code','Python Code'),
-            ('trigger','Trigger'),
-            ('email','Email'),
-            ('sms','SMS'),
-            ('object_create','Create Object'),
-            ('object_copy','Copy Object'),
-            ('object_write','Write Object'),
-            ('other','Multi Actions'),
+            ('client_action', 'Client Action'),
+            ('dummy', 'Dummy'),
+            ('loop', 'Iteration'),
+            ('code', 'Python Code'),
+            ('trigger', 'Trigger'),
+            ('email', 'Email'),
+            ('sms', 'SMS'),
+            ('object_create', 'Create Object'),
+            ('object_copy', 'Copy Object'),
+            ('object_write', 'Write Object'),
+            ('other', 'Multi Actions'),
         ], 'Action Type', required=True, size=32, help="Type of the Action that is to be executed"),
         'code':fields.text('Python Code', help="Python code to be executed"),
         'sequence': fields.integer('Sequence', help="Important when you deal with multiple actions, the execution order will be decided based on this, low number is higher priority."),
@@ -470,7 +470,7 @@
         'action_id': fields.many2one('ir.actions.actions', 'Client Action', help="Select the Action Window, Report, Wizard to be executed."),
         'trigger_name': fields.selection(_select_signals, string='Trigger Name', size=128, help="Select the Signal name that is to be used as the trigger."),
         'wkf_model_id': fields.many2one('ir.model', 'Workflow On', help="Workflow to be executed on this model."),
-        'trigger_obj_id': fields.many2one('ir.model.fields','Trigger On', help="Select the object from the model on which the workflow will executed."),
+        'trigger_obj_id': fields.many2one('ir.model.fields', 'Trigger On', help="Select the object from the model on which the workflow will executed."),
         'email': fields.char('Email Address', size=512, help="Provides the fields that will be used to fetch the email address, e.g. when you select the invoice, then `object.invoice_address_id.email` is the field which gives the correct address"),
         'subject': fields.char('Subject', size=1024, translate=True, help="Specify the subject. You can use fields from the object, e.g. `Hello [[ object.partner_id.name ]]`"),
         'message': fields.text('Message', translate=True, help="Specify the message. You can use the fields from the object. e.g. `Dear [[ object.partner_id.name ]]`"),
@@ -594,13 +594,13 @@
             if not expr:
                 continue
 
-            if action.state=='client_action':
+            if action.state == 'client_action':
                 if not action.action_id:
                     raise osv.except_osv(_('Error'), _("Please specify an action to launch !"))
                 return self.pool.get(action.action_id.type)\
                     .read(cr, uid, action.action_id.id, context=context)
 
-            if action.state=='code':
+            if action.state == 'code':
                 localdict = {
                     'self': self.pool.get(action.model_id.model),
                     'context': dict(context), # copy context to prevent side-effects of eval
@@ -619,7 +619,7 @@
                 user = config['email_from']
                 address = str(action.email)
                 try:
-                    address =  eval(str(action.email), cxt)
+                    address = eval(str(action.email), cxt)
                 except:
                     pass
 
@@ -784,33 +784,39 @@
 # This model use to register action services.
 TODO_STATES = [('open', 'To Do'),
                ('done', 'Done'),
-               ('skip','Skipped'),
-               ('cancel','Cancelled')]
+               ('skip', 'Skipped'),
+               ('cancel', 'Cancelled')]
 
 class ir_actions_todo(osv.osv):
     _name = 'ir.actions.todo'
-    _columns={
+    _columns = {
         'action_id': fields.many2one(
             'ir.actions.act_window', 'Action', select=True, required=True,
             ondelete='cascade'),
         'sequence': fields.integer('Sequence'),
         'state': fields.selection(TODO_STATES, string='State', required=True),
         'name':fields.char('Name', size=64),
-        'restart': fields.selection([('onskip','On Skip'),('always','Always'),('never','Never')],'Restart',required=True),
+        'restart': fields.selection([('onskip', 'On Skip'), ('always', 'Always'), ('never', 'Never')], 'Restart', required=True),
         'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note':fields.text('Text', translate=True),
+        'previous': fields.many2one('ir.actions.todo', string='Previous'),
     }
-    _defaults={
+    _defaults = {
         'state': 'open',
         'sequence': 10,
         'restart': 'onskip',
     }
-    _order="sequence,name,id"
+    _order = "sequence,name,id"
+    
+    def del_previous(self, cr, uid):
+        ids = self.search(cr, uid, [])
+        self.write(cr, uid, ids, {'previous': False})
 
     def action_launch(self, cr, uid, ids, context=None):
         """ Launch Action of Wizard"""
         if context is None:
             context = {}
+        self.del_previous(cr, uid)
         wizard_id = ids and ids[0] or False
         wizard = self.browse(cr, uid, wizard_id, context=context)
         res = self.pool.get('ir.actions.act_window').read(cr, uid, wizard.action_id.id, ['name', 'view_type', 'view_mode', 'res_model', 'context', 'views', 'type'], context=context)

=== modified file 'bin/addons/base/res/res_config.py'
--- bin/addons/base/res/res_config.py	2011-01-20 16:27:37 +0000
+++ bin/addons/base/res/res_config.py	2012-09-10 15:46:26 +0000
@@ -45,35 +45,35 @@
         a tuple of (non_open_todos:int, total_todos: int)
         '''
         return (self.pool.get('ir.actions.todo')\
-                .search_count(cr, uid, [('state','<>','open')], context),
+                .search_count(cr, uid, [('state', '<>', 'open')], context),
                 self.pool.get('ir.actions.todo')\
                 .search_count(cr, uid, [], context))
 
     def _progress(self, cr, uid, context=None):
         closed, total = self.get_current_progress(cr, uid, context=context)
         if total:
-            return round(closed*100./total)
+            return round(closed * 100. / total)
         return 100.
 
     _columns = dict(
-        progress = fields.float('Configuration Progress', readonly=True),
+        progress=fields.float('Configuration Progress', readonly=True),
     )
 
     _defaults = dict(
-        progress = _progress,
+        progress=_progress,
     )
 
     def _next_action(self, cr, uid, context=None):
         todos = self.pool.get('ir.actions.todo')
         self.__logger.info('getting next %s', todos)
-        active_todos = todos.search(cr, uid, [('state','=','open')],
+        active_todos = todos.search(cr, uid, [('state', '=', 'open')],
                                     limit=1)
         if active_todos:
             todo_obj = todos.browse(cr, uid, active_todos[0], context=None)
             todo_groups = map(lambda x:x.id, todo_obj.groups_id)
             dont_skip_todo = True
             if todo_groups:
-                cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN %s",(uid, tuple(todo_groups),))
+                cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN %s", (uid, tuple(todo_groups),))
                 dont_skip_todo = bool(cr.fetchone())
             if dont_skip_todo:
                 return todos.browse(cr, uid, active_todos[0], context=None)
@@ -89,18 +89,29 @@
         # this is ultra brittle, but apart from storing the todo id
         # into the res.config view, I'm not sure how to get the
         # "previous" todo
+        if not context:
+            context = {}
         previous_todo = self._next_action(cr, uid, context=context)
         if not previous_todo:
             self.__logger.warn(_("Couldn't find previous ir.actions.todo"))
             return
         previous_todo.write({'state':state})
+        if not context.get('no_update_previous', False):
+            next_action = self._next_action(cr, uid, context=context)
+            previous_todo.write({'previous': next_action and next_action.id or False})
 
     def _next(self, cr, uid, context=None):
+        if not context:
+            context = {}
         self.__logger.info('getting next operation')
         next = self._next_action(cr, uid)
         self.__logger.info('next action is %s', next)
         if next:
             action = next.action_id
+            if context.get('no_update_previous', False):
+                c = {'previous_id': next.id}
+            else:
+                c = {}
             return {
                 'view_mode': action.view_mode,
                 'view_type': action.view_type,
@@ -108,6 +119,7 @@
                 'res_model': action.res_model,
                 'type': action.type,
                 'target': action.target,
+                'context': c,
             }
         self.__logger.info('all configuration actions have been executed')
 
@@ -119,8 +131,9 @@
 
     def start(self, cr, uid, ids, context=None):
         ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context)
+        self.pool.get('ir.actions.todo').write(cr, uid, ids2, {'previous': False})
         for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context):
-            if (todo.restart=='always') or (todo.restart=='onskip' and (todo.state in ('skip','cancel'))):
+            if (todo.restart == 'always') or (todo.restart == 'onskip' and (todo.state in ('skip', 'cancel'))):
                 todo.write({'state':'open'})
         return self.next(cr, uid, ids, context)
 
@@ -167,6 +180,45 @@
         next = self.execute(cr, uid, ids, context=None)
         if next: return next
         return self.next(cr, uid, ids, context=context)
+    
+    def action_previous(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        
+        context.update({'no_update_previous': True})
+        
+        previous = self.next(cr, uid, ids, context=context)
+        if previous.get('context', {}).get('previous_id', False):
+            previous_id = self.pool.get('ir.actions.todo').search(cr, uid, [('previous', '=', previous['context']['previous_id'])])
+            if previous_id:
+                self.pool.get('ir.actions.todo').write(cr, uid, previous_id[0], {'state': 'open'})
+                action = self.pool.get('ir.actions.todo').browse(cr, uid, previous_id[0]).action_id
+                return {
+                        'view_mode': action.view_mode,
+                        'view_type': action.view_type,
+                        'view_id': action.view_id and [action.view_id.id] or False,
+                        'res_model': action.res_model,
+                        'type': action.type,
+                        'target': action.target,
+                    }
+            else:
+                raise osv.except_osv(_('Error'), _('No previous wizard found !'))
+        else:
+            raise osv.except_osv(_('Error'), _('No previous wizard found !'))
+        
+        current_user_menu = self.pool.get('res.users')\
+            .browse(cr, uid, uid).menu_id
+        # return the action associated with the menu
+        return self.pool.get(current_user_menu.type)\
+            .read(cr, uid, current_user_menu.id)
+        
+    def action_finish(self, cr, uid, ids, context=None):
+        self.action_next(cr, uid, ids, context=context)
+        open_todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('state', '=', 'open')])
+        self.pool.get('ir.actions.todo').write(cr, uid, open_todo_ids, {'state': 'done'})
+        
+        return self.next(cr, uid, ids, context=context)
+        
 
     def action_skip(self, cr, uid, ids, context=None):
         """ Action handler for the ``skip`` event.
@@ -309,8 +361,8 @@
         return modules.browse(
             cr, uid,
             modules.search(cr, uid,
-                           [('name','in',selectable),
-                            ('state','in',['to install', 'installed', 'to upgrade'])],
+                           [('name', 'in', selectable),
+                            ('state', 'in', ['to install', 'installed', 'to upgrade'])],
                            context=context),
             context=context)
 
@@ -342,7 +394,7 @@
 
         hooks_results = set()
         for module in base:
-            hook = getattr(self, '_if_%s'%(module), None)
+            hook = getattr(self, '_if_%s' % (module), None)
             if hook:
                 hooks_results.update(hook(cr, uid, ids, context=None) or set())
 
@@ -380,7 +432,7 @@
                 continue
             fields[module.name].update(
                 readonly=True,
-                help= ustr(fields[module.name].get('help', '')) +
+                help=ustr(fields[module.name].get('help', '')) + 
                      _('\n\nThis addon is already installed on your system'))
         return fields
 
@@ -391,7 +443,7 @@
         self.__logger.info('Selecting addons %s to install', to_install)
         modules.state_update(
             cr, uid,
-            modules.search(cr, uid, [('name','in',to_install)]),
+            modules.search(cr, uid, [('name', 'in', to_install)]),
             'to install', ['uninstalled'], context=context)
         cr.commit() #TOFIX: after remove this statement, installation wizard is fail
         new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
@@ -408,7 +460,7 @@
     not to break existing but not-yet-migrated addons, the old wizard was
     reintegrated and gutted.
     '''
-    _name='ir.actions.configuration.wizard'
+    _name = 'ir.actions.configuration.wizard'
     _inherit = 'res.config'
     __logger = logging.getLogger(_name)
 

=== modified file 'bin/addons/base/res/res_config.xml'
--- bin/addons/base/res/res_config.xml	2010-12-29 20:12:50 +0000
+++ bin/addons/base/res/res_config.xml	2012-09-10 15:46:26 +0000
@@ -19,14 +19,18 @@
            </group>
          </group>
          <group colspan="8" col="8">
-           <separator string="" colspan="6"/>
+           <separator string="" colspan="8"/>
            <group colspan="4" width="220">
              <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
            </group>
+           <button name="action_previous" icon="terp-gtk-go-back-ltr"
+                   type="object" string="Previous" colspan="1" />
            <button name="action_skip" icon="gtk-jump-to" special="cancel"
                    type="object" string="Skip" colspan="1"/>
            <button name="action_next" icon="gtk-go-forward"
                    type="object" string="Next" colspan="1"/>
+           <button name="action_finish" icon="gtk-quit"
+                   type="object" string="Finish" colspan="1" />
          </group>
         </form>
       </field>