[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9567 rev-id: odo@openerp...
authorOlivier Dony <odo@openerp.com>
Tue, 5 Nov 2013 12:26:34 +0000 (13:26 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 5 Nov 2013 12:26:34 +0000 (13:26 +0100)
bzr revid: dle@openerp.com-20131031142609-jinks18n2ju7usm4
bzr revid: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: odo@openerp.com-20131105122634-joau6mg9jqpvbauz

1  2 
addons/hr_recruitment/hr_recruitment.py
addons/l10n_multilang/l10n_multilang.py
addons/project/project.py
addons/project_issue/project_issue.py
addons/purchase/report/purchase_report.py
addons/sale/report/sale_report.py
addons/sale_stock/report/sale_report.py
addons/stock/stock.py

@@@ -148,7 -146,8 +146,7 @@@ class wizard_multi_charts_accounts(osv.
          obj_fiscal_position = self.pool.get('account.fiscal.position')
          in_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)], order='id')
          out_ids = obj_fiscal_position.search(cr, uid, [('company_id', '=', company_id)], order='id')
-         return self.process_translations(cr, uid, langs, obj_fiscal_position_template, field, in_ids, obj_fiscal_position, out_ids, force_write=False, context=context)
+         return self.process_translations(cr, uid, langs, obj_fiscal_position_template, field, in_ids, obj_fiscal_position, out_ids, context=context)
  
 -wizard_multi_charts_accounts()
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@@ -1219,20 -1204,10 +1219,21 @@@ class task(base_stage, osv.osv)
          return [task.project_id.message_get_reply_to()[0] if task.project_id else False
                      for task in self.browse(cr, uid, ids, context=context)]
  
 +    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
 +        """ mail.message document permission rule: can post a new message if can read
 +            because of portal document. """
 +        if not model_obj:
 +            model_obj = self
 +        if operation == 'create':
 +            model_obj.check_access_rights(cr, uid, 'read')
 +            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
 +        else:
 +            return super(task, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
 +
      def message_new(self, cr, uid, msg, custom_values=None, context=None):
          """ Override to updates the document according to the email. """
-         if custom_values is None: custom_values = {}
+         if custom_values is None:
+             custom_values = {}
          defaults = {
              'name': msg.get('subject'),
              'planned_hours': 0.0,
Simple merge
Simple merge
Simple merge