[MERGE] Merge the pos chagnes

bzr revid: sbh@tinyerp.com-20120309104758-2tohiu6ma2kb3p80

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a6fe706..c0a7d29 100644 (file)
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -597,21 +597,20 @@ class crm_lead(crm_case, osv.osv):
             'is_company': is_company,
             'type': 'contact'
         }
-
         partner = partner.create(cr, uid,vals, context)
         return partner
 
     def _create_lead_partner(self, cr, uid, lead, context=None):
         partner_id =  False
         if lead.partner_name and lead.contact_name:
-            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, 'partner', context=context)
-            self._lead_create_contact(cr, uid, lead, lead.contact_name, 'contact', partner_id, context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
+            self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
         elif lead.partner_name and not lead.contact_name:
-            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, 'partner', context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
         elif not lead.partner_name and lead.contact_name:
-            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, 'contact', context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, False, context=context)
         else:
-            partner_id = self._lead_create_contact(cr, uid, lead, lead.name, 'contact', context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.name, False, context=context)
         return partner_id
 
     def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8f6a7a5..ba3ee3a 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -980,7 +980,8 @@ class stock_picking(osv.osv):
             @param journal_id: ID of the accounting journal
             @return: dict that will be used to create the invoice object
         """
-        partner = self.pool.get('res.partner').browse(cr, uid, partner, context=context)
+        if isinstance(partner, int):
+            partner = self.pool.get('res.partner').browse(cr, uid, partner, context=context)
         if inv_type in ('out_invoice', 'out_refund'):
             account_id = partner.property_account_receivable.id
         else: