From ec7fb807750bc2dd385ffe61caf399551b08c696 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Mon, 21 Sep 2015 10:20:03 +0200
Subject: [PATCH] [REM] delivery: unused field for now, should not have been
 merged in a223111b922d3c3d8957f894bf20a156eb96d324

---
 addons/delivery/models/delivery_carrier.py | 8 --------
 addons/delivery/views/delivery_view.xml    | 3 ---
 2 files changed, 11 deletions(-)

diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index dd3fed33f82..4aa8987b5dc 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -49,7 +49,6 @@ class DeliveryCarrier(models.Model):
     zip_from = fields.Char('Zip From')
     zip_to = fields.Char('Zip To')
     price_rule_ids = fields.One2many('delivery.price.rule', 'carrier_id', 'Pricing Rules', copy=True)
-    state = fields.Selection([('test', 'Testing'), ('production', 'Production')], 'State')
     fixed_price = fields.Float(compute='_compute_fixed_price', inverse='_set_product_fixed_price', store=True, string='Fixed Price',help="Keep empty if the pricing depends on the advanced pricing per destination")
     shipping_enabled = fields.Boolean(string="Shipping enabled", default=True, help="Uncheck this box to disable package shipping while validating Delivery Orders")
 
@@ -62,13 +61,6 @@ class DeliveryCarrier(models.Model):
         for carrier in self:
             carrier.product_id.list_price = carrier.fixed_price
 
-    @api.onchange('delivery_type')
-    def onchange_delivery_type(self):
-        if self.delivery_type in ["fixed", "base_on_rule"]:
-            self.state = 'production'
-        else:
-            self.state = 'test'
-
     @api.one
     def get_price(self):
         SaleOrder = self.env['sale.order']
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 16af2a46c55..78779765750 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -22,9 +22,6 @@
             <field name="model">delivery.carrier</field>
             <field name="arch" type="xml">
                 <form string="Carrier">
-                    <header>
-                        <field name="state" widget="statusbar" attrs="{'invisible':['|', ('delivery_type', '=', 'fixed'), ('delivery_type', '=', 'base_on_rule')]}" clickable="True"/>
-                    </header>
                     <sheet>
                         <div class="oe_title" name="title">
                             <label for="name" string="Name" class="oe_edit_only"/>