[MERGE] forward port of branch saas-3 up to 3d4b82c

diff --cc addons/account/report/account_partner_ledger.py
Simple merge

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

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

diff --cc addons/im_livechat/im_livechat.py
index be005ed,5925084..f455e38
--- 1/addons/im_livechat/im_livechat.py
--- 2/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@@ -53,33 -103,20 +53,33 @@@ class im_livechat_channel(osv.Model)
                      break
          return res
  
 -    def _script(self, cr, uid, ids, name, arg, context=None):
 +    def _script_external(self, cr, uid, ids, name, arg, context=None):
 +        values = {
-             "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
++            "url": self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID, 'web.base.url'),
 +            "dbname":cr.dbname
 +        }
          res = {}
          for record in self.browse(cr, uid, ids, context=context):
 -            res[record.id] = env.get_template("include.html").render({
 -                "url": self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID, 'web.base.url'),
 -                "parameters": {"db":cr.dbname, "channel":record.id},
 -            })
 +            values["channel"] = record.id
 +            res[record.id] = self.pool['ir.ui.view'].render(cr, uid, 'im_livechat.external_loader', values, context=context)
 +        return res
 +
 +    def _script_internal(self, cr, uid, ids, name, arg, context=None):
 +        values = {
-             "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
++            "url": self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID 'web.base.url'),
 +            "dbname":cr.dbname
 +        }
 +        res = {}
 +        for record in self.browse(cr, uid, ids, context=context):
 +            values["channel"] = record.id
 +            res[record.id] = self.pool['ir.ui.view'].render(cr, uid, 'im_livechat.internal_loader', values, context=context)
          return res
  
      def _web_page(self, cr, uid, ids, name, arg, context=None):
          res = {}
          for record in self.browse(cr, uid, ids, context=context):
-             res[record.id] = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + \
+             res[record.id] = self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID, 'web.base.url') + \
 -                "/im_livechat/web_page?p=" + json.dumps({"db":cr.dbname, "channel":record.id})
 +                "/im_livechat/support/%s/%i" % (cr.dbname, record.id)
          return res
  
      _columns = {

diff --cc addons/product/product.py
index 763d139,25368e8..da17e95
--- 1/addons/product/product.py
--- 2/addons/product/product.py
+++ b/addons/product/product.py
@@@ -26,10 -26,8 +26,10 @@@ from _common import ceilin
  
  from openerp import SUPERUSER_ID
  from openerp import tools
- from openerp.osv import osv, fields
 -from openerp.osv import osv, orm, fields, expression
++from openerp.osv import osv, fields, expression
  from openerp.tools.translate import _
 +from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 +import psycopg2
  
  import openerp.addons.decimal_precision as dp
  from openerp.tools.float_utils import float_round

diff --cc addons/purchase/purchase.py
index 97f7e52,8365739..d3b1e04
--- 1/addons/purchase/purchase.py
--- 2/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@@ -28,8 -29,9 +28,9 @@@ from openerp.tools.safe_eval import saf
  from openerp.osv import fields, osv
  from openerp.tools.translate import _
  import openerp.addons.decimal_precision as dp
 -from openerp.osv.orm import browse_record, browse_null
 +from openerp.osv.orm import browse_record_list, browse_record, browse_null
  from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
+ from openerp.tools.float_utils import float_compare
  
  class purchase_order(osv.osv):