From f0e4d2e6fc2b3898d7df53202e59a128cb420dc8 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Tue, 18 Nov 2008 09:37:29 +0530
Subject: [PATCH] display price on delivery grid list view on selecting
 delivery grid on sale order form

bzr revid: hmo@tinyerp.com-20081118040729-yy8r9bi6h0ukdp9e
---
 addons/delivery/delivery_view.xml | 5 +++--
 addons/delivery/sale.py           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 52bf075ad65..0c008c5db55 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -125,7 +125,8 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <separator string="Notes" position="before">
-                    <field name="carrier_id" context="{'order_id':active_id}"/>
+                    <field name="id" invisible="True"/>
+                    <field name="carrier_id" context="{'order_id':id}"/>
                 </separator>
             </field>
         </record>
@@ -136,7 +137,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="after">
+                <field name="address_id" position="after">                   
                     <field name="carrier_id"/>
                     <field name="weight"/>
                 </field>
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index a7889b494c2..76498dc8cbd 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -30,6 +30,7 @@ class sale_order(osv.osv):
     _description = "Sale Order"
 
     _columns = {
+        'id': fields.integer('ID', readonly=True,invisible=True),
         'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."),
     }