From f5eaac16d03a44737c5d0c2818b087f900ade06e Mon Sep 17 00:00:00 2001 From: fp Date: Sun, 4 Sep 2011 18:56:31 +0200 Subject: [PATCH] [IMP] useability field on SO bzr revid: fp@fp-laptop-20110904165631-451lq0lg9lsbs421 --- addons/sale/sale.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 17d2c636e12..8886cbb9e6f 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -219,16 +219,16 @@ class sale_order(osv.osv): 'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')], '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', 'Payment Before Delivery'), - ('manual', 'Shipping & Manual Invoice'), - ('postpaid', 'Invoice On Order After Delivery'), - ('picking', 'Invoice From The Picking'), - ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, - help="""The Shipping Policy is used to synchronise invoice and delivery operations. - - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice. - - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice. - - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished. - - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""), + ('prepaid', 'Pay before delivery'), + ('manual', 'Deliver & invoice on demand'), + ('picking', 'Invoice based on deliveries'), + ('postpaid', 'Invoice on order after delivery'), + ], 'Invoice Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, + help="""The Invoice Policy is used to synchronise invoice and delivery operations. + - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice. + - The 'Deliver & Invoice on demand' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice based on the sale order or the sale order lines. + - The 'Invoice on order after delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished. + - The 'Invoice based on deliveries' choice is used to create an invoice during the picking process."""), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."), 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),