Merge lp:~openerp-community/openobject-addons/contact-id-solution-for-v7-contact-management into lp:openobject-addons/7.0

[Raphaël Valyi - http://www.akretion.com]

[lp:~openerp-community/openobject-addons/contact-id-solution-for-v7-contact-management]

9028. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[FIX] fix invoice and picking creation. Wrong the contact should be the contact selected on the sale order, and the partner the commercial_entity related to this contact

[Olivier Dony (Odoo) (odo-openerp)]

Please see my comment on the server merge proposal this branch depends on:
  https://code.launchpad.net/~openerp-community/openobject-server/contact-id-solution-for-v7-contact-management/+merge/159316

In addition:

- l.178,207: the fact that you need to specifically follow ".commercial_entity_id" illustrates the problem of the mixin not dealing properly with multiple partner fields in the original model (as mentioned in the server MP review)
- l.236: shouldn't that be 'contact_id' rather than 'contact'?

review: Disapprove

[lp:~openerp-community/openobject-addons/contact-id-solution-for-v7-contact-management]

9029. By Raphaël Valyi - http://www.akretion.com on 2013-04-17

[FIX] green on all email, #SorrySAP ;)

9030. By njeudy on 2013-04-17

[FIX] more account invoice report polish for contact_id

9031. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[IMP] improve reporting on invoice, now we can also group by and filter by contact

9032. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[REF] remove contact_id as mixin already add it

9033. By njeudy on 2013-04-17

[FIX] this should fix picking reports for contact_id

9034. By Raphaël Valyi - http://www.akretion.com on 2013-04-17

[FIX] contact_id solution: contact_id is optional, fall back on partner_id

9035. By Sébastien BEAU - http://www.akretion.com on 2013-04-18

[FIX] opening the invoice from the res.partner is now possible

9036. By Raphaël Valyi - http://www.akretion.com on 2013-04-18

[FIX] green on CRM: meeting and phone calls for contacts. Yeahbzr diff crm we can finally call ourselves a true ERP... beware SAP the end is near...

9037. By Raphaël Valyi - http://www.akretion.com on 2013-04-21

[FIX] contact mixin for account.analytic.account, project.project and crm.claim. I consider all objects who should get a contact mixin have it now

Unmerged revisions

9037. By Raphaël Valyi - http://www.akretion.com on 2013-04-21

[FIX] contact mixin for account.analytic.account, project.project and crm.claim. I consider all objects who should get a contact mixin have it now

9036. By Raphaël Valyi - http://www.akretion.com on 2013-04-18

[FIX] green on CRM: meeting and phone calls for contacts. Yeahbzr diff crm we can finally call ourselves a true ERP... beware SAP the end is near...

9035. By Sébastien BEAU - http://www.akretion.com on 2013-04-18

[FIX] opening the invoice from the res.partner is now possible

9034. By Raphaël Valyi - http://www.akretion.com on 2013-04-17

[FIX] contact_id solution: contact_id is optional, fall back on partner_id

9033. By njeudy on 2013-04-17

[FIX] this should fix picking reports for contact_id

9032. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[REF] remove contact_id as mixin already add it

9031. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[IMP] improve reporting on invoice, now we can also group by and filter by contact

9030. By njeudy on 2013-04-17

[FIX] more account invoice report polish for contact_id

9029. By Raphaël Valyi - http://www.akretion.com on 2013-04-17

[FIX] green on all email, #SorrySAP ;)

9028. By Sébastien BEAU - http://www.akretion.com on 2013-04-17

[FIX] fix invoice and picking creation. Wrong the contact should be the contact selected on the sale order, and the partner the commercial_entity related to this contact

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-04-18 15:40:22 +0000
+++ account/account_invoice.py	2013-04-21 22:51:24 +0000
@@ -184,7 +184,7 @@
         return invoice_ids
 
     _name = "account.invoice"
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'res.contact.mixin']
     _description = 'Invoice'
     _order = "id desc"
     _track = {
 
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-04-10 13:53:08 +0000
+++ account/account_invoice_view.xml	2013-04-21 22:51:24 +0000
@@ -622,7 +622,7 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window domain="['|', ['partner_id', '=', active_id], ['contact_id', '=', active_id]]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
 
=== modified file 'account/edi/invoice_action_data.xml'
--- account/edi/invoice_action_data.xml	2012-12-14 11:31:32 +0000
+++ account/edi/invoice_action_data.xml	2013-04-21 22:51:24 +0000
@@ -24,7 +24,7 @@
             <field name="name">Invoice - Send by Email</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="email_recipients">${object.contact_id and object.contact_id.id or object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="account_invoices"/>
 
=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2013-03-21 18:55:41 +0000
+++ account/report/account_invoice_report.py	2013-04-21 22:51:24 +0000
@@ -26,6 +26,7 @@
 class account_invoice_report(osv.osv):
     _name = "account.invoice.report"
     _description = "Invoices Statistics"
+    _inherit = ['res.contact.mixin']
     _auto = False
     _rec_name = 'date'
 
@@ -103,7 +104,7 @@
 
     def _select(self):
         select_str = """
-            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id, sub.contact_id,
                 sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
                 sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
                 sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
@@ -119,7 +120,7 @@
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text) AS year,
                     to_char(ai.date_invoice::timestamp with time zone, 'MM'::text) AS month,
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text) AS day,
-                    ail.product_id, ai.partner_id, ai.payment_term, ai.period_id,
+                    ail.product_id, ai.partner_id, ai.contact_id, ai.payment_term, ai.period_id,
                     CASE
                      WHEN u.uom_type::text <> 'reference'::text
                         THEN ( SELECT product_uom.name
@@ -190,7 +191,7 @@
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text),
                     to_char(ai.date_invoice::timestamp with time zone, 'MM'::text),
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text),
-                    ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
+                    ai.partner_id, ai.contact_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
                     ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
                     ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
                     ai.amount_total, u.uom_type, u.category_id
 
=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml	2013-03-26 17:02:58 +0000
+++ account/report/account_print_invoice.rml	2013-04-21 22:51:24 +0000
@@ -161,13 +161,12 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.contact_id or o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.contact_id and o.contact_id.phone or o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.contact_id and o.contact_id.fax or o.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">TIN : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
 
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2013-04-10 12:20:11 +0000
+++ analytic/analytic.py	2013-04-21 22:51:24 +0000
@@ -29,7 +29,7 @@
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'res.contact.mixin']
     _description = 'Analytic Account'
     _track = {
         'state': {
 
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2013-04-17 09:09:25 +0000
+++ crm/crm_lead.py	2013-04-21 22:51:24 +0000
@@ -72,7 +72,7 @@
     _name = "crm.lead"
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
+    _inherit = ['mail.thread', 'ir.needaction_mixin', 'res.contact.mixin']
 
     _track = {
         'state': {
@@ -240,7 +240,6 @@
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', track_visibility='onchange',
             select=True, help="Linked partner (optional). Usually created when converting the lead."),
-
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Subject', size=64, required=True, select=1),
         'active': fields.boolean('Active', required=False),
@@ -911,10 +910,11 @@
         """
         opportunity = self.browse(cr, uid, ids[0], context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        default_partner_id = opportunity.contact_id and opportunity.contact_id.id or opportunity.partner_id and opportunity.partner_id.id or False
         res['context'] = {
             'default_opportunity_id': opportunity.id,
-            'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
-            'default_partner_ids' : opportunity.partner_id and [opportunity.partner_id.id] or False,
+            'default_partner_id': default_partner_id,
+            'default_partner_ids' : default_partner_id and [default_partner_id] or False,
             'default_user_id': uid,
             'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
             'default_email_from': opportunity.email_from,
 
=== modified file 'crm/wizard/crm_opportunity_to_phonecall.py'
--- crm/wizard/crm_opportunity_to_phonecall.py	2013-03-07 16:28:51 +0000
+++ crm/wizard/crm_opportunity_to_phonecall.py	2013-04-21 22:51:24 +0000
@@ -42,6 +42,7 @@
         res = {}
         res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+            contact = opp.contact_id or opp.partner_id
             if 'name' in fields:
                 res.update({'name': opp.name})
             if 'user_id' in fields:
@@ -51,11 +52,11 @@
             if 'categ_id' in fields:
                 res.update({'categ_id': categ_id})
             if 'partner_id' in fields:
-                res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
+                res.update({'partner_id': contact and contact.id or False})
             if 'contact_name' in fields:
-                res.update({'contact_name': opp.partner_id and opp.partner_id.name or False})
+                res.update({'contact_name': contact and contact.name or False})
             if 'phone' in fields:
-                res.update({'phone': opp.phone or (opp.partner_id and opp.partner_id.phone or False)})
+                res.update({'phone': opp.phone or (contact and contact.phone or False)})
         return res
 
     def action_schedule(self, cr, uid, ids, context=None):
 
=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2013-01-15 13:43:59 +0000
+++ crm_claim/crm_claim.py	2013-04-21 22:51:24 +0000
@@ -72,7 +72,7 @@
     _name = "crm.claim"
     _description = "Claim"
     _order = "priority,date desc"
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'res.contact.mixin']
 
     _columns = {
         'id': fields.integer('ID', readonly=True),
 
=== modified file 'portal_sale/portal_sale_data.xml'
--- portal_sale/portal_sale_data.xml	2012-12-21 16:48:08 +0000
+++ portal_sale/portal_sale_data.xml	2013-04-21 22:51:24 +0000
@@ -8,7 +8,7 @@
             <field name="name">Sales Order - Send by Email (Portal)</field>
             <field name="email_from">${object.user_id.email or ''}</field>
             <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_invoice_id.id}</field>
+            <field name="email_recipients">${object.contact_id and object.contact_id.id or object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="sale.report_sale_order"/>
@@ -97,7 +97,7 @@
             <field name="name">Invoice - Send by Email (Portal)</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="email_recipients">${object.contact_id and object.contact_id.id or object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="account.account_invoices"/>
 
=== modified file 'project/project.py'
--- project/project.py	2013-04-12 14:37:19 +0000
+++ project/project.py	2013-04-21 22:51:24 +0000
@@ -77,7 +77,7 @@
     _description = "Project"
     _inherits = {'account.analytic.account': "analytic_account_id",
                  "mail.alias": "alias_id"}
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
+    _inherit = ['mail.thread', 'ir.needaction_mixin', 'res.contact.mixin.methods']
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
 
=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml	2013-03-08 14:24:48 +0000
+++ purchase/edi/purchase_order_action_data.xml	2013-04-21 22:51:24 +0000
@@ -21,7 +21,7 @@
             <field name="name">Purchase Order - Send by mail</field>
             <field name="email_from">${object.validator.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="email_recipients">${object.contact_id and object.contact_id.id or object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="report_purchase_quotation"/>
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-04-09 12:25:30 +0000
+++ purchase/purchase.py	2013-04-21 22:51:24 +0000
@@ -242,7 +242,7 @@
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
+    _inherit = ['mail.thread', 'ir.needaction_mixin', 'res.contact.mixin']
     _description = "Purchase Order"
     _order = "name desc"
 
@@ -542,6 +542,7 @@
                 'reference': order.partner_ref or order.name,
                 'account_id': pay_acc_id,
                 'type': 'in_invoice',
+                'contact_id': order.contact_id and order.contact_id.id,
                 'partner_id': order.partner_id.id,
                 'currency_id': order.pricelist_id.currency_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
@@ -624,6 +625,7 @@
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
             'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'partner_id': order.dest_address_id.id or order.partner_id.id,
+            'contact_id': order.contact_id and order.contact_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
             'partner_id': order.dest_address_id.id or order.partner_id.id,
 
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml	2012-12-15 16:23:09 +0000
+++ purchase/report/request_quotation.rml	2013-04-21 22:51:24 +0000
@@ -101,7 +101,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
+          <para style="terp_default_9">[[ display_address(order.contact_id or order.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
 
=== modified file 'purchase/report/request_quotation.sxw'
 Binary files purchase/report/request_quotation.sxw	2012-12-08 10:33:38 +0000 and purchase/report/request_quotation.sxw	2013-04-21 22:51:24 +0000 differ
=== modified file 'sale/edi/sale_order_action_data.xml'
--- sale/edi/sale_order_action_data.xml	2012-12-21 16:48:08 +0000
+++ sale/edi/sale_order_action_data.xml	2013-04-21 22:51:24 +0000
@@ -22,7 +22,7 @@
             <field name="name">Sales Order - Send by Email</field>
             <field name="email_from">${object.user_id.email or ''}</field>
             <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_invoice_id.id}</field>
+            <field name="email_recipients">${object.contact_id and object.contact_id.id or object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="report_sale_order"/>
 
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml	2013-03-18 13:56:54 +0000
+++ sale/report/sale_order.rml	2013-04-21 22:51:24 +0000
@@ -178,8 +178,8 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
+          <para style="terp_default_9">[[ (o.contact_id and o.contact_id.title and o.contact_id.title.name) or '' ]] [[ (o.contact_id and o.contact_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ o.contact_id and display_address(o.contact_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
 
=== modified file 'sale/report/sale_order.sxw'
 Binary files sale/report/sale_order.sxw	2013-03-18 13:56:54 +0000 and sale/report/sale_order.sxw	2013-04-21 22:51:24 +0000 differ
=== modified file 'sale/sale.py'
--- sale/sale.py	2013-04-18 17:21:23 +0000
+++ sale/sale.py	2013-04-21 22:51:24 +0000
@@ -47,7 +47,7 @@
 
 class sale_order(osv.osv):
     _name = "sale.order"
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
+    _inherit = ['mail.thread', 'ir.needaction_mixin', 'res.contact.mixin']
     _description = "Sales Order"
     _track = {
         'state': {
@@ -368,7 +368,8 @@
             'type': 'out_invoice',
             'reference': order.client_order_ref or order.name,
             'account_id': order.partner_id.property_account_receivable.id,
-            'partner_id': order.partner_invoice_id.id,
+            'contact_id': order.partner_invoice_id.id,
+            'partner_id': order.partner_invoice_id.commercial_entity_id.id,
             'journal_id': journal_ids[0],
             'invoice_line': [(6, 0, lines)],
             'currency_id': order.pricelist_id.currency_id.id,
 
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py	2012-12-21 16:48:08 +0000
+++ sale_crm/wizard/crm_make_sale.py	2013-04-21 22:51:24 +0000
@@ -46,8 +46,8 @@
         if not active_id:
             return False
 
-        lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
-        return lead['partner_id']
+        lead = lead_obj.read(cr, uid, active_id, ['contact_id'])
+        return lead['contact_id']
 
     def view_init(self, cr, uid, fields_list, context=None):
         return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
 
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2013-04-09 12:25:30 +0000
+++ sale_stock/sale_stock.py	2013-04-21 22:51:24 +0000
@@ -344,7 +344,8 @@
             'state': 'auto',
             'move_type': order.picking_policy,
             'sale_id': order.id,
-            'partner_id': order.partner_shipping_id.id,
+            'contact_id': order.partner_shipping_id.id,
+            'partner_id': order.partner_shipping_id.commercial_entity_id.id,
             'note': order.note,
             'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
             'company_id': order.company_id.id,
 
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml	2013-03-06 15:36:19 +0000
+++ stock/report/picking.rml	2013-04-21 22:51:24 +0000
@@ -168,9 +168,9 @@
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
-          <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
-          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
+          <para style="terp_default_9">[[ picking.contact_id and picking.contact_id.title.name or picking.partner_id and picking.partner_id.title.name or '']] [[ picking.contact_id and picking.contact_id.name or picking.partner_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.contact_id or picking.partner_id) ]] </para>
+          <para style="terp_default_9">[[ picking.contact_id and picking.contact_id.phone or picking.contact_id.email or picking.partner_id and picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2013-04-05 15:30:21 +0000
+++ stock/stock.py	2013-04-21 22:51:24 +0000
@@ -545,7 +545,7 @@
 #----------------------------------------------------------
 class stock_picking(osv.osv):
     _name = "stock.picking"
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'res.contact.mixin']
     _description = "Picking List"
 
     def _set_maximum_date(self, cr, uid, ids, name, value, arg, context=None):
@@ -1026,6 +1026,7 @@
             'origin': (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
             'type': inv_type,
             'account_id': account_id,
+            'contact': picking.contact_id and picking.contact_id.id,
             'partner_id': partner.id,
             'comment': comment,
             'payment_term': payment_term,