Forward port of branch 7.0 up to 1933e92

diff --cc addons/crm/crm_lead.py
index dcb1287,b04eae9..a5315ab
--- 1/addons/crm/crm_lead.py
--- 2/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@@ -153,7 -165,12 +153,12 @@@ class crm_lead(format_address, osv.osv)
          return result, fold
  
      def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+         if view_type == 'form' and context and context.get('opportunity_id'):
+             # TODO: replace by get_formview_action call
+             lead_type = self.browse(cr, user, context['opportunity_id'], context=context).type
+             view_lead_xml_id = 'crm_case_form_view_oppor' if lead_type == 'opportunity' else 'crm_case_form_view_leads'
+             _, view_id = self.pool['ir.model.data'].get_object_reference(cr, user, 'crm', view_lead_xml_id)
 -        res = super(crm_lead,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
 +        res = super(crm_lead, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
          if view_type == 'form':
              res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
          return res

diff --cc addons/crm/crm_phonecall_view.xml
Simple merge

diff --cc addons/portal_sale/portal_sale_view.xml
Simple merge

diff --cc addons/stock/stock.py
index 5492b60,f117bdb..cf8bcef
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1356,13 -1364,15 +1357,15 @@@ class stock_picking(osv.osv)
                  # Then we finish the good picking
                  self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
                  self.action_move(cr, uid, [new_picking], context=context)
 -                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
 -                wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
 +                self.signal_button_done(cr, uid, [new_picking])
 +                workflow.trg_write(uid, 'stock.picking', pick.id, cr)
                  delivered_pack_id = new_picking
                  self.message_post(cr, uid, new_picking, body=_("Back order <em>%s</em> has been <b>created</b>.") % (pick.name), context=context)
+             elif empty_picking:
+                 delivered_pack_id = pick.id
              else:
                  self.action_move(cr, uid, [pick.id], context=context)
 -                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
 +                self.signal_button_done(cr, uid, [pick.id])
                  delivered_pack_id = pick.id
  
              delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)