odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] better useability 

bzr revid: fp@tinyerp.com-20111002160410-l7db0cwv2j1173tt
This commit is contained in:
Fabien Pinckaers 2011-10-02 18:04:10 +02:00
parent b8af9b3423
commit 709bdcf3e9
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/delivery/delivery.py
View File

@ -249,8 +249,10 @@ class define_delivery_steps(osv.osv_memory):
_name = 'delivery.define.delivery.steps.wizard'
_columns = {
'picking_policy' : fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery'),],
'Picking Policy', required=True),
'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once'),],
}
_defaults = {
'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
}
def apply_cb(self, cr, uid, ids, context=None):
@ -262,5 +264,4 @@ class define_delivery_steps(osv.osv_memory):
define_delivery_steps()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

5
addons/delivery/delivery_view.xml
View File

@ -342,7 +342,8 @@
<field name="model">delivery.define.delivery.steps.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Setup Your Delivery Steps">
<form string="Setup Your Picking Policy">
<separator string="Choose Your Default Picking Policy" colspan="4"/>
<field name="picking_policy" />
<separator string="" colspan="4"/>
<group colspan="4">
@ -354,7 +355,7 @@
</record>
<record model="ir.actions.act_window" id="action_define_delivery_steps">
<field name="name">Setup Your Delivery Steps</field>
<field name="name">Setup Your Picking Policy</field>
<field name="res_model">delivery.define.delivery.steps.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>

2
addons/sale/sale.py
View File

@ -216,7 +216,7 @@ class sale_order(osv.osv):
'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
'picking_policy': fields.selection([('direct', 'Deliver each products when available'), ('one', 'Deliver all products at once')],
'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
'order_policy': fields.selection([
('prepaid', 'Pay before delivery'),