[MERGE] Forward-port saas-3 up to b9275da

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account_followup/account_followup.py
index 82ae10a,4ed1250..5e78320
--- 1/addons/account_followup/account_followup.py
--- 2/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@@ -268,10 -273,7 +268,10 @@@ class res_partner(osv.osv)
                      if date <= current_date and aml['balance'] > 0:
                          strbegin = "<TD><B>"
                          strend = "</B></TD>"
-                     followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['name'] + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
+                     followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['name'] + strend + strbegin + (aml['ref'] or '') + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
 +
 +                total = reduce(lambda x, y: x+y['balance'], currency_dict['line'], 0.00)
 +
                  total = rml_parse.formatLang(total, dp='Account', currency_obj=currency)
                  followup_table += '''<tr> </tr>
                                  </table>

diff --cc addons/gamification/models/goal.py
index 041c6ae,58aebbc..686dd94
--- 1/addons/gamification/models/goal.py
--- 2/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@@ -194,8 -187,8 +194,8 @@@ class gamification_goal(osv.Model)
  
      _columns = {
          'definition_id': fields.many2one('gamification.goal.definition', string='Goal Definition', required=True, ondelete="cascade"),
-         'user_id': fields.many2one('res.users', string='User', required=True),
+         'user_id': fields.many2one('res.users', string='User', required=True, auto_join=True),
 -        'line_id': fields.many2one('gamification.challenge.line', string='Goal Line', ondelete="cascade"),
 +        'line_id': fields.many2one('gamification.challenge.line', string='Challenge Line', ondelete="cascade"),
          'challenge_id': fields.related('line_id', 'challenge_id',
              string="Challenge",
              type='many2one',

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

diff --cc addons/web/controllers/main.py
index c98bce8,31a2c52..ec5b2aa
--- 1/addons/web/controllers/main.py
--- 2/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@@ -1725,13 -1713,14 +1726,14 @@@ class ExportFormat(object)
          model, fields, ids, domain, import_compat = \
              operator.itemgetter('model', 'fields', 'ids', 'domain',
                                  'import_compat')(
-                 simplejson.loads(data))
+                 params)
  
          Model = request.session.model(model)
-         ids = ids or Model.search(domain, 0, False, False, request.context)
+         context = dict(req.context or {}, **params.get('context', {}))
+         ids = ids or Model.search(domain, 0, False, False, context)
  
          field_names = map(operator.itemgetter('name'), fields)
-         import_data = Model.export_data(ids, field_names, self.raw_data, context=request.context).get('datas',[])
 -        import_data = Model.export_data(ids, field_names, context).get('datas',[])
++        import_data = Model.export_data(ids, field_names, self.raw_data, context=context).get('datas',[])
  
          if import_compat:
              columns_headers = field_names

diff --cc addons/web/static/src/js/data_export.js
Simple merge

diff --cc openerp/osv/fields.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge