From 6acb9e8e9f5a65a8d20510ef8a6e1bf292a3cf40 Mon Sep 17 00:00:00 2001
From: Nandan Jani <nja@openerp.com>
Date: Wed, 7 Jan 2015 10:37:55 +0530
Subject: [PATCH] [IMP] delivery: added a sequence on on carrier model + handle
 widget on list view.

---
 addons/delivery/delivery.py       | 3 +++
 addons/delivery/delivery_data.xml | 1 +
 addons/delivery/delivery_demo.xml | 2 ++
 addons/delivery/delivery_view.xml | 1 +
 4 files changed, 7 insertions(+)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 59574c7e0d9..fe0c0ef5370 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -31,6 +31,7 @@ _logger = logging.getLogger(__name__)
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
     _description = "Carrier"
+    _order = 'sequence, id'
 
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
@@ -77,6 +78,7 @@ class delivery_carrier(osv.osv):
 
     _columns = {
         'name': fields.char('Delivery Method', required=True),
+        'sequence': fields.integer('Sequence', help="Determine the display order"),
         'partner_id': fields.many2one('res.partner', 'Transport Company', required=True, help="The partner that is doing the delivery service."),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
@@ -94,6 +96,7 @@ class delivery_carrier(osv.osv):
     _defaults = {
         'active': 1,
         'free_if_more_than': False,
+        'sequence': 10,
     }
 
     def grid_get(self, cr, uid, ids, contact_id, context=None):
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 62cd70554fb..d567a8aff86 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -26,6 +26,7 @@
             <field name="normal_price">0</field>
             <field name="free_if_more_than" eval="True"/>
             <field name="amount">1000</field>
+            <field name="sequence">1</field>
             <field name="partner_id" ref="res_partner_delivery"/>
             <field name="product_id" ref="product_product_delivery"/>
         </record>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index a535145f6d8..9cfd2e6befb 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -15,6 +15,7 @@
         <record id="delivery_carrier" model="delivery.carrier">
             <field name="name">The Poste</field>
             <field name="normal_price">20</field>
+            <field name="sequence">2</field>
             <field name="partner_id" ref="res_partner_delivery"/>
             <field name="product_id" ref="product_product_delivery"/>
             <field name="use_detailed_pricelist" eval="True"/>
@@ -23,6 +24,7 @@
         <record id="normal_delivery_carrier" model="delivery.carrier">
             <field name="name">Normal Delivery Charges</field>
             <field name="normal_price">10</field>
+            <field name="sequence">3</field>
             <field name="partner_id" ref="res_partner_delivery"/>
             <field name="product_id" ref="product_product_delivery"/>
         </record>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 98ea8641efa..70cb12bf0e7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -9,6 +9,7 @@
             <field name="model">delivery.carrier</field>
             <field name="arch" type="xml">
                 <tree string="Carrier">
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="price" invisible="'order_id' not in context"/>