[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131...

bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay

diff --cc addons/account_analytic_analysis/account_analytic_analysis.py
index 7b21a4f,97437e6..65d87ca
--- 1/addons/account_analytic_analysis/account_analytic_analysis.py
--- 2/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@@ -653,9 -653,9 +653,9 @@@ class account_analytic_account(osv.osv)
          fpos_obj = self.pool.get('account.fiscal.position')
  
          if not contract.partner_id:
 -            raise osv.except_osv(_('No Customer Defined !'),_("You must first select a Customer for Contract %s!") % contract.name )
 +            raise osv.except_osv(_('No Customer Defined!'),_("You must first select a Customer for Contract %s!") % contract.name )
  
-         fpos = contract.partner_id.property_account_position.id or False
+         fpos = contract.partner_id.property_account_position or False
          journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', contract.company_id.id or False)], limit=1)
          if not journal_ids:
              raise osv.except_osv(_('Error!'),

diff --cc addons/crm/wizard/crm_lead_to_opportunity.py
index d954e04,9e1109e..4809794
--- 1/addons/crm/wizard/crm_lead_to_opportunity.py
--- 2/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@@ -63,7 -62,7 +63,7 @@@ class crm_lead2opportunity_partner(osv.
                  for id in ids:
                      tomerge.add(id)
              if email:
-                 ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]),  ('probability', '<', '100')])
 -                ids = lead_obj.search(cr, uid, [('email_from', '=ilike', email[0]), ('state', '!=', 'done')])
++                ids = lead_obj.search(cr, uid, [('email_from', '=ilike', email[0]),  ('probability', '<', '100')])
                  for id in ids:
                      tomerge.add(id)
  

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

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

diff --cc addons/portal/portal_demo.xml
Simple merge

diff --cc addons/report_webkit/webkit_report.py
Simple merge

diff --cc addons/share/wizard/share_wizard.py
Simple merge