Merge lp:~openerp-dev/openobject-addons/trunk-common-action-controller-jas into lp:openobject-addons

[ajay javiya (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-common-action-controller-jas]

9452. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: Optimization

9453. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: change in _mail_action condition and optimization

9454. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: add action_xml_id in _mail_object

9455. By Jamin Shah(OpenERP) on 2014-05-14

[MERGE]: with Trunk

9456. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: changes in write() for sending template

9457. By Jamin Shah(OpenERP) on 2014-05-15

[IMP]: add _mail_actions in hr_applicant and safe coding in mail write method for calling message_post

9458. By Jamin Shah(OpenERP) on 2014-05-15

[IMP]: Code Optimization

9459. By Jamin Shah(OpenERP) on 2014-05-16

[IMP]: Code Optimization

9460. By Jamin Shah(OpenERP) on 2014-05-16

[MERGE]: with trunk

9461. By Jamin Shah(OpenERP) on 2014-05-19

[IMP]: Code Optimization

9462. By Jamin Shah(OpenERP) on 2014-05-20

[IMP]: Code Optimization

Unmerged revisions

9462. By Jamin Shah(OpenERP) on 2014-05-20

[IMP]: Code Optimization

9461. By Jamin Shah(OpenERP) on 2014-05-19

[IMP]: Code Optimization

9460. By Jamin Shah(OpenERP) on 2014-05-16

[MERGE]: with trunk

9459. By Jamin Shah(OpenERP) on 2014-05-16

[IMP]: Code Optimization

9458. By Jamin Shah(OpenERP) on 2014-05-15

[IMP]: Code Optimization

9457. By Jamin Shah(OpenERP) on 2014-05-15

[IMP]: add _mail_actions in hr_applicant and safe coding in mail write method for calling message_post

9456. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: changes in write() for sending template

9455. By Jamin Shah(OpenERP) on 2014-05-14

[MERGE]: with Trunk

9454. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: add action_xml_id in _mail_object

9453. By Jamin Shah(OpenERP) on 2014-05-14

[IMP]: change in _mail_action condition and optimization

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-05-07 17:01:12 +0000
+++ account/account_invoice.py	2014-05-20 08:59:26 +0000
@@ -225,6 +225,21 @@
             'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'),
         },
     }
+    _mail_actions = [{
+        'name': 'invoice_validate',
+        'type': 'object',
+        'string': 'Validate',
+        'condition': lambda self, obj, context=None: obj.state == 'draft',
+        'button_type': 'success'
+    },
+    {
+        'name': 'action_cancel',
+        'type': 'object',
+        'string': 'Cancel',
+        'condition': lambda self, obj, context=None: obj.state == 'draft',
+        'button_type': 'warning'
+    }]
+
     _columns = {
         'name': fields.char('Reference/Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
 
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2014-04-01 12:36:57 +0000
+++ analytic/analytic.py	2014-05-20 08:59:26 +0000
@@ -38,6 +38,27 @@
             'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
+    _mail_actions = [{
+        'name': 'set_pending',
+        'type': 'object',
+        'string': 'Renew',
+        'condition': lambda self, obj, context=None: obj.state == 'open',
+        'button_type': 'success'
+    },
+    {
+        'name': 'set_close',
+        'type': 'object',
+        'string': 'Close',
+        'condition': lambda self, obj, context=None: obj.state == 'open' or obj.state == 'pending',
+        'button_type': 'warning'
+    },
+    {
+        'name': 'set_cancel',
+        'type': 'object',
+        'string': 'Cancel',
+        'condition': lambda self, obj, context=None: obj.state == 'open' or obj.state == 'pending',
+        'button_type': 'warning'
+    }]
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
         currency_obj = self.pool.get('res.currency')
 
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-05-12 11:41:49 +0000
+++ crm/crm_lead.py	2014-05-20 08:59:26 +0000
@@ -79,6 +79,21 @@
             'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.fold and obj.stage_id.sequence > 1,
         },
     }
+    _mail_actions = [{
+        'name': 'set_user',
+        'type': 'object',
+        'string': 'I will manage it',
+        'condition': lambda self, obj, context=None: not obj.user_id,
+        'button_type': 'success'
+    },
+    {
+        'type': 'action',
+        'string': 'Not interested',
+        'condition': lambda self, obj, context=None: not obj.user_id,
+        'button_type': 'warning',
+        'action_xml_id': 'crm_case_category_act_oppor11',
+        'module': 'crm'
+    }]
     _mail_mass_mailing = _('Leads / Opportunities')
 
     def get_empty_list_help(self, cr, uid, help, context=None):
@@ -317,6 +332,9 @@
         ('check_probability', 'check(probability >= 0 and probability <= 100)', 'The probability of closing the deal should be between 0% and 100%!')
     ]
 
+    def set_user(self, cr, uid, ids, context=None):
+        self.pool['crm.lead'].write(cr, uid, ids, {'user_id':uid})
+
     def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
         if not stage_id:
             return {'value': {}}
 
=== modified file 'event/event.py'
--- event/event.py	2014-05-12 07:23:31 +0000
+++ event/event.py	2014-05-20 08:59:26 +0000
@@ -327,6 +327,20 @@
     }
     _order = 'name, create_date desc'
 
+    _mail_actions = [{
+        'name': 'registration_open',
+        'type': 'object',
+        'string': 'Confirm',
+        'condition': lambda self, obj, context=None: obj.state == 'draft',
+        'button_type': 'success'
+    },
+    {
+        'name': 'button_reg_cancel',
+        'type': 'object',
+        'string': 'Cancel',
+        'condition': lambda self, obj, context=None: obj.state == 'draft' or obj.state == 'open',
+        'button_type': 'warning'
+    }]
 
     def _check_seats_limit(self, cr, uid, ids, context=None):
         for registration in self.browse(cr, uid, ids, context=context):
 
=== modified file 'fleet/fleet.py'
--- fleet/fleet.py	2014-05-07 07:56:45 +0000
+++ fleet/fleet.py	2014-05-20 08:59:26 +0000
@@ -792,10 +792,25 @@
             res[contract.id] = totalsum
         return res
 
+    _inherit = ['mail.thread']
     _inherits = {'fleet.vehicle.cost': 'cost_id'}
     _name = 'fleet.vehicle.log.contract'
     _description = 'Contract information on a vehicle'
     _order='state desc,expiration_date'
+    _mail_actions = [{
+        'name': 'act_renew_contract',
+        'type': 'object',
+        'string': 'Renew',
+        'condition': lambda self, obj, context=None: obj.state == 'open' or obj.state == 'closed',
+        'button_type': 'success'
+    },
+    {
+        'name': 'contract_close',
+        'type': 'object',
+        'string': 'Terminate',
+        'condition': lambda self, obj, context=None: obj.state == 'open',
+        'button_type': 'warning'
+    }]
     _columns = {
         'name': fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True),
         'start_date': fields.date('Contract Start Date', help='Date when the coverage of the contract begins'),
 
=== modified file 'fleet/fleet_view.xml'
--- fleet/fleet_view.xml	2014-03-28 13:30:51 +0000
+++ fleet/fleet_view.xml	2014-05-20 08:59:26 +0000
@@ -502,6 +502,10 @@
                             <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
                         </group>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
 
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2014-05-07 08:35:56 +0000
+++ hr_holidays/hr_holidays.py	2014-05-20 08:59:26 +0000
@@ -111,6 +111,20 @@
             'hr_holidays.mt_holidays_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
         },
     }
+    _mail_actions = [{
+        'name': 'holidays_validate',
+        'type': 'object',
+        'string': 'Approve',
+        'condition': lambda self, obj, context=None: obj.state == 'confirm',
+        'button_type': 'success'
+    },
+    {
+        'name': 'holidays_refuse',
+        'type': 'object',
+        'string': 'Refuse',
+        'condition': lambda self, obj, context=None: obj.state == 'confirm' or obj.state == 'validate',
+        'button_type': 'warning'
+    }]
 
     def _employee_get(self, cr, uid, context=None):        
         emp_id = context.get('default_employee_id', False)
 
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2014-05-08 12:35:29 +0000
+++ hr_recruitment/hr_recruitment.py	2014-05-20 08:59:26 +0000
@@ -87,6 +87,20 @@
             'hr_recruitment.mt_applicant_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence > 1,
         },
     }
+    _mail_actions = [{
+        'name': 'applicant_first_interview',
+        'type': 'object',
+        'string': 'Approve',
+        'condition': lambda self, obj, context=None: obj.stage_id.name == 'Initial Qualification',
+        'button_type': 'success'
+    },
+    {
+        'name': 'applicant_refused',
+        'type': 'object',
+        'string': 'Refuse',
+        'condition': lambda self, obj, context=None: obj.stage_id.name == 'Initial Qualification',
+        'button_type': 'warning'
+    }]
     _mail_mass_mailing = _('Applicants')
 
     def _get_default_department_id(self, cr, uid, context=None):
@@ -240,6 +254,16 @@
         'stage_id': _read_group_stage_ids
     }
 
+    def applicant_first_interview(self, cr, uid, ids, context=None):
+        stage_id = self.pool['hr.recruitment.stage'].search(cr, uid, [('name','=','First Interview')], context=context)
+        if stage_id:
+            self.pool['hr.applicant'].write(cr, uid, ids, {'stage_id':stage_id[0]}, context=context)
+
+    def applicant_refused(self, cr, uid, ids, context=None):
+        stage_id = self.pool['hr.recruitment.stage'].search(cr, uid, [('name','=','Refused')], context=context)
+        if stage_id:
+            self.pool['hr.applicant'].write(cr, uid, ids, {'stage_id':stage_id[0]}, context=context)
+
     def onchange_job(self, cr, uid, ids, job_id=False, context=None):
         department_id = False
         if job_id:
 
=== modified file 'mail/controllers/main.py'
--- mail/controllers/main.py	2014-04-30 11:00:48 +0000
+++ mail/controllers/main.py	2014-05-20 08:59:26 +0000
@@ -1,5 +1,6 @@
 import base64
 import psycopg2
+import werkzeug
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -42,3 +43,17 @@
             except psycopg2.Error:
                 pass
         return True
+
+    @http.route('/mail_action/<model>/<int:id>', type='http', auth='user')
+    def mail_action(self, model, id, action_name=None, action_type=None, action_id=None):
+        if not request.session.uid:
+            return login_redirect()
+        redirect_url = "/web?db=%s#id=%s&model=%s" %(request.db, id, model)
+        object_pool = request.registry.get(model)
+        if action_type in ['workflow','object']:
+            action = getattr(object_pool,action_name)
+            action(request.cr, request.uid, [id], context=request.context)
+            redirect_url += "&view_type=form"
+        if action_type == 'action':
+            redirect_url += "&action=%s" % action_id
+        return werkzeug.utils.redirect(redirect_url)
 
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2014-05-12 10:04:00 +0000
+++ mail/mail_thread.py	2014-05-20 08:59:26 +0000
@@ -24,6 +24,8 @@
 import datetime
 import dateutil
 import email
+import jinja2
+import sys
 try:
     import simplejson as json
 except ImportError:
@@ -46,6 +48,14 @@
 
 _logger = logging.getLogger(__name__)
 
+if hasattr(sys, 'frozen'):
+    # When running on compiled windows binary, we don't have access to package loader.
+    path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'views'))
+    loader = jinja2.FileSystemLoader(path)
+else:
+    loader = jinja2.PackageLoader('openerp.addons.mail', "views")
+
+env = jinja2.Environment(loader=loader, autoescape=True)
 
 def decode_header(message, header, separator=' '):
     return separator.join(map(decode, filter(None, message.get_all(header, []))))
@@ -96,6 +106,14 @@
     #   :param obj: is a browse_record
     #   :param function lambda: returns whether the tracking should record using this subtype
     _track = {}
+    _default_mail_actions = [{
+    'name': 'message_unsubscribe_users',
+    'type': 'object',
+    'string': 'Mute',
+    'condition': lambda self, obj, context=None: True,
+    'button_type': 'info'
+    }]
+    _mail_actions = []
 
     # Mass mailing feature
     _mail_mass_mailing = False
@@ -346,6 +364,23 @@
             res['arch'] = etree.tostring(doc)
         return res
 
+    def _prepare_body_mail_action(self, cr, uid, obj, context=None):
+        mail_actions = []
+        data_pool = self.pool['ir.model.data']
+        for mail_action in self._mail_actions + self._default_mail_actions:
+            condition_fn = mail_action['condition']
+            if mail_action.get('action_xml_id'):
+                dummy, act_id = data_pool.get_object_reference(cr, uid, mail_action['module'], mail_action['action_xml_id'])
+                mail_action['xml_id'] = act_id
+            if condition_fn(self, obj, context=context):
+                mail_actions.append(mail_action)
+        mail_actions_body = env.get_template("mail_actions_button.html").render({
+            'mail_actions': mail_actions,
+            'model': self._name,
+            'res_id': obj.id
+        })
+        return mail_actions_body
+
     #------------------------------------------------------
     # CRUD overrides for automatic subscription and logging
     #------------------------------------------------------
@@ -358,7 +393,6 @@
         """
         if context is None:
             context = {}
-
         if context.get('tracking_disable'):
             return super(mail_thread, self).create(
                 cr, uid, values, context=context)
@@ -370,11 +404,17 @@
             message_follower_ids.append([4, pid])
             values['message_follower_ids'] = message_follower_ids
         thread_id = super(mail_thread, self).create(cr, uid, values, context=context)
-
+        message_body = ''
+        mail_actions_body = ''
+        if thread_id:
+            obj = self.browse(cr, uid, thread_id, context=context)
+            mail_actions_body = self._prepare_body_mail_action(cr, uid, obj)
         # automatic logging unless asked not to (mainly for various testing purpose)
         if not context.get('mail_create_nolog'):
-            self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
-
+            message_body +=_('%s created %s') % (self._description, mail_actions_body)
+        else:
+            message_body += mail_actions_body
+        self.message_post(cr, uid, thread_id, body=message_body, context=context)
         # auto_subscribe: take values and defaults into account
         create_values = dict(values)
         for key, val in context.iteritems():
@@ -415,6 +455,12 @@
             initial_values = dict((record.id, dict((key, getattr(record, key)) for key in tracked_fields))
                                   for record in records)
 
+        if ids:
+            obj = self.browse(cr, uid, ids[0], context=context)
+            mail_actions_body = self._prepare_body_mail_action(cr, uid, obj)
+            message_body = mail_actions_body
+            self.message_post(cr, uid, ids[0], body=message_body, context=context)
+
         # Perform write, update followers
         result = super(mail_thread, self).write(cr, uid, ids, values, context=context)
         self.message_auto_subscribe(cr, uid, ids, values.keys(), context=context, values=values)
 
=== added file 'mail/views/mail_actions_button.html'
--- mail/views/mail_actions_button.html	1970-01-01 00:00:00 +0000
+++ mail/views/mail_actions_button.html	2014-05-20 08:59:26 +0000
@@ -0,0 +1,6 @@
+<div name="mail_actions_group">
+    {% set button_style = {'info': 'background: gray', 'warning': 'background: red', 'success': 'background:green'} %}
+    {% for button in mail_actions %}
+        <a class="btn btn-default" name="mail_action" style="color:BLACK;{{ button_style[button.button_type] }}" href="/mail_action/{{ model }}/{{ res_id }}?action_name={{ button.name }}&action_type={{ button.type }}&action_id={{ button.xml_id }}"> {{ button.string }} </a>
+    {% endfor %}
+</div>
 
=== modified file 'project/project.py'
--- project/project.py	2014-05-13 11:18:37 +0000
+++ project/project.py	2014-05-20 08:59:26 +0000
@@ -568,6 +568,13 @@
             'project.mt_task_ready': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done',
         },
     }
+    _mail_actions = [{
+        'name': 'set_user',
+        'type': 'object',
+        'string': 'I will do it',
+        'condition': lambda self, obj, context=None: not obj.user_id,
+        'button_type': 'success'
+    }]
 
     def _get_default_partner(self, cr, uid, context=None):
         project_id = self._get_default_project_id(cr, uid, context)
@@ -666,6 +673,9 @@
                 res[task.id]['progress'] = 100.0
         return res
 
+    def set_user(self, cr, uid, ids, context=None):
+        self.pool['project.task'].write(cr, uid, ids, {'user_id':uid})
+
     def onchange_remaining(self, cr, uid, ids, remaining=0.0, planned=0.0):
         if remaining and not planned:
             return {'value': {'planned_hours': remaining}}
 
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2014-05-08 15:25:36 +0000
+++ project_issue/project_issue.py	2014-05-20 08:59:26 +0000
@@ -60,6 +60,21 @@
             'project_issue.mt_issue_ready': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done',
         },
     }
+    _mail_actions = [{
+        'name': 'set_user',
+        'type': 'object',
+        'string': 'I will do it',
+        'condition': lambda self, obj, context=None: not obj.user_id,
+        'button_type': 'success'
+    },
+    {
+        'type': 'action',
+        'string': 'Not interested',
+        'condition': lambda self, obj, context=None: not obj.user_id,
+        'button_type': 'warning',
+        'action_xml_id': 'action_view_issues',
+        'module': 'project_issue'
+    }]
 
     def _get_default_partner(self, cr, uid, context=None):
         project_id = self._get_default_project_id(cr, uid, context)
@@ -306,6 +321,9 @@
         'stage_id': _read_group_stage_ids
     }
 
+    def set_user(self, cr, uid, ids, context=None):
+        self.pool['project.issue'].write(cr, uid, ids, {'user_id':uid})
+
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default: