[REM] delivery: unused field for now, should not have been merged in a223111b92

This commit is contained in:
Richard Mathot
2015-09-21 10:20:03 +02:00
parent f41575238b
commit ec7fb80775
2 changed files with 0 additions and 11 deletions
@@ -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']
-3
View File
@@ -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"/>