From fd0169cb95c512eff4ab18880d48e02587110c12 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 4 Aug 2010 15:59:08 +0530
Subject: [PATCH] [Fix] stock: Fix the problem of sale_id and purchase_id

bzr revid: sbh@tinyerp.com-20100804102908-n09h43jvr30advdp
---
 addons/stock/report/packing.rml              | 12 ++++++------
 addons/stock/stock_report.xml                |  1 +
 addons/stock/wizard/stock_partial_picking.py |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml
index 07c8758b8c0..3db817996d9 100644
--- a/addons/stock/report/packing.rml
+++ b/addons/stock/report/packing.rml
@@ -152,11 +152,11 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">[[ picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
+          <para style="terp_tblheader_Details">[[ 'sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -204,7 +204,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 3084e8527a7..68b324dc9b2 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,6 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
+ 		<report id="report_packing_list" model="stock.picking" name="stock.picking.list2" string="Packing list" rml="stock/report/packing.rml"/>        
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 5cad3807ab3..009ef9323cf 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -177,12 +177,12 @@ class stock_partial_picking(osv.osv_memory):
                 if (m.product_id.cost_method == 'average'):
                     currency = False
                     price = 0
-                    if (pick.type == 'in'):
+                    if (pick.type == 'in') and 'purchase_id' in pick._columns.keys():
                         if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
                             price = m.purchase_line_id.price_unit
                         if hasattr(pick, 'purchase_id') and pick.purchase_id:
                             currency = pick.purchase_id.pricelist_id.currency_id.id
-                    if (pick.type == 'out'):
+                    if (pick.type == 'out') and 'sale_id' in pick._columns.keys():
                         if hasattr(m, 'sale_line_id') and m.sale_line_id:
                             price = m.sale_line_id.price_unit
                         if hasattr(pick, 'sale_id') and pick.sale_id: