Merge lp:~openerp-commiter/openobject-addons/6_0_bug_768368 into lp:openobject-addons/6.0

[Lorenzo Battistini]

This fixes the bug 768368 ( https://bugs.launchpad.net/openobject-addons/+bug/768368 ) for 6.0 series

Unmerged revisions

4554. By Lorenzo Battistini on 2011-05-02

[FIX] sale installation wizard offers two choices for order_policy instead of 4

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-01-19 08:38:17 +0000
+++ sale/sale.py	2011-05-02 10:55:50 +0000
@@ -1178,8 +1178,10 @@
             ('one', 'All at Once')
         ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
         'order_policy': fields.selection([
-            ('manual', 'Invoice Based on Sales Orders'),
-            ('picking', 'Invoice Based on Deliveries'),
+            ('prepaid', 'Payment Before Delivery'),
+            ('manual', 'Shipping & Manual Invoice'),
+            ('postpaid', 'Invoice On Order After Delivery'),
+            ('picking', 'Invoice From The Picking'),
         ], 'Shipping Default Policy', required=True,
            help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([