openerp-dev-web team mailing list archive

["Naresh\(OpenERP\)" <nch@xxxxxxxxxxx>]

Naresh(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-sale_configuration-skh into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-sale_configuration-skh/+merge/58088

Hello,

[Fix] : Inside configuration wizard 'Sales Application Configuration', there are two selection fields 'Picking default policy' and 'Shipping default policy'.The configuration is mismatch compare to sale order field.(help should be proper and should be same.)

Thanks
skh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-sale_configuration-skh/+merge/58088
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-bug-sale_configuration-skh into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-02-22 09:27:33 +0000
+++ sale/sale.py	2011-04-18 08:55:57 +0000
@@ -1180,12 +1180,14 @@
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('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.."),
+        ], 'Picking Default Policy', required=True, help="If you are sure that you have enough stock to send complete order at once please select 'All at Once'. If you want to send the order in the partial shipments please select 'Direct Delivery'..."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Shipping Default Policy', required=True,
-           help="You can generate invoices based on sales orders or based on shippings."),
+           help="""The Shipping Policy is used to synchronise invoice and delivery operations.
+        - The "Invoice Based on Sales Orders" choice 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 Based on Deliveries" choice is used to create an invoice during the picking process."""),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')