[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com...

bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/base_calendar/base_calendar.py
index 6194324,2e1503d..7c5c880
--- 1/addons/base_calendar/base_calendar.py
--- 2/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@@ -28,9 -29,9 +28,9 @@@ from openerp.tools.translate import 
  import pytz
  import re
  import time
- 
+ from operator import itemgetter
  from openerp import tools, SUPERUSER_ID
 +import openerp.service.report
  
  months = {
      1: "January", 2: "February", 3: "March", 4: "April", \

diff --cc addons/base_calendar/crm_meeting.py
index 66823e0,a19b287..af87db1
--- 1/addons/base_calendar/crm_meeting.py
--- 2/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@@ -139,7 -135,7 +139,7 @@@ class mail_message(osv.osv)
  
      def _find_allowed_model_wise(self, cr, uid, doc_model, doc_dict, context=None):
          if doc_model == 'crm.meeting':
-             for virtual_id in self.pool[doc_model].get_recurrent_ids(cr, uid, doc_dict.keys(), [], context=context):
 -            for virtual_id in self.pool.get(doc_model)._get_recurrent_ids(cr, uid, doc_dict.keys(), [], context=context):
++            for virtual_id in self.pool[doc_model]._get_recurrent_ids(cr, uid, doc_dict.keys(), [], context=context):
                  doc_dict.setdefault(virtual_id, doc_dict[get_real_ids(virtual_id)])
          return super(mail_message, self)._find_allowed_model_wise(cr, uid, doc_model, doc_dict, context=context)
  

diff --cc addons/decimal_precision/decimal_precision.py
index b237f05,890a57a..6c64533
--- 1/addons/decimal_precision/decimal_precision.py
--- 2/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@@ -19,10 -19,10 +19,11 @@@
  #
  ##############################################################################
  
 +import openerp
  from openerp import SUPERUSER_ID
 -from openerp import pooler, tools
 +from openerp import tools
  from openerp.osv import osv, fields
+ from openerp.modules.registry import RegistryManager
  
  class decimal_precision(osv.osv):
      _name = 'decimal.precision'
@@@ -56,13 -65,10 +66,9 @@@
  
      def write(self, cr, uid, ids, data, *args, **argv):
          res = super(decimal_precision, self).write(cr, uid, ids, data, *args, **argv)
-         self.precision_get.clear_cache(self)
-         for obj in self.pool.obj_list():
-             for colname, col in self.pool[obj]._columns.items():
-                 if isinstance(col, (fields.float, fields.function)):
-                     col.digits_change(cr)
+         self.clear_cache(cr)
          return res
  
 -decimal_precision()
  
  def get_precision(application):
      def change_digit(cr):

diff --cc addons/mail/static/src/js/mail.js
Simple merge

diff --cc addons/mrp/procurement.py
Simple merge