bugfix

bzr revid: fp@tinyerp.com-20081204080503-vubo0n5xgk7t2usr

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 400d796..a0bdd2e 100644 (file)
--- 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"/>
+                    <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 c1bff9f..ff110ca 100644 (file)
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -28,6 +28,7 @@ class sale_order(osv.osv):
     _inherit = 'sale.order' 
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."),
+        'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
     def onchange_partner_id(self, cr, uid, ids, part):