merge upstream

bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn

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

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

diff --cc addons/hw_escpos/controllers/main.py
index df0119e,5b42e97..16df99a
--- 1/addons/hw_escpos/controllers/main.py
--- 2/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@@ -18,12 -18,10 +18,13 @@@ try
  except ImportError:
      usb = None
  
 -from openerp.tools.translate import _
 -from .. import escpos
 -from ..escpos import printer
 -from ..escpos import supported_devices
 +try:
 +    from .. import escpos
 +    from ..escpos import printer
++    from ..escpos import supported_devices
 +except ImportError:
 +    escpos = printer = None
 +
  from PIL import Image
  
  from openerp import http

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

diff --cc addons/im_livechat/im_livechat_view.xml
Simple merge

diff --cc addons/im_livechat/security/ir.model.access.csv
index 6e501ee,1ed578f..d73e093
--- 1/addons/im_livechat/security/ir.model.access.csv
--- 2/addons/im_livechat/security/ir.model.access.csv
+++ b/addons/im_livechat/security/ir.model.access.csv
@@@ -2,7 -2,5 +2,5 @@@ id,name,model_id:id,group_id:id,perm_re
  access_ls_chann1,im_livechat.channel,model_im_livechat_channel,,1,0,0,0
  access_ls_chann2,im_livechat.channel,model_im_livechat_channel,group_im_livechat,1,1,1,0
  access_ls_chann3,im_livechat.channel,model_im_livechat_channel,group_im_livechat_manager,1,1,1,1
- access_ls_message_portal,im_livechat.im.message.portal,im.model_im_message,base.group_portal,0,0,0,0
 -access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,portal.group_portal,1,0,0,0
 -access_im_user,im_livechat.im.user,im.model_im_user,portal.group_anonymous,1,0,0,0
 +access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,base.group_portal,1,0,0,0
- access_ls_message,im_livechat.im.message,im.model_im_message,base.group_public,0,0,0,0
 +access_im_user,im_livechat.im.user,im.model_im_user,base.group_public,1,0,0,0

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

diff --cc addons/purchase/purchase_view.xml
Simple merge