[IMP] delivery: added a sequence on on carrier
model + handle widget on list view.
This commit is contained in:
committed by
Thibault Delavallée
parent
7f1564a9f1
commit
6acb9e8e9f
@@ -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):
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
Reference in New Issue
Block a user