Merge lp:~openerp-dev/openobject-addons/trunk-bug-782168-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

The tooltip of the pricelist_id field have been improved and also the author name has also been corrected.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-782168-bde]

4731. By Bharat Devnani (Open ERP) on 2011-09-15

[MERGE] merged with main addons

[Fabien (Open ERP) (fp-tinyerp)]

setting a tooltip does not serve anything. (people will not read the tooltip)

Unmerged revisions

4731. By Bharat Devnani (Open ERP) on 2011-09-15

[MERGE] merged with main addons

4730. By Olivier Dony on 2011-06-07

[IMP] account : Improved the tooltip of pricelist_id

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-15 13:56:13 +0000
+++ sale/sale.py	2011-09-15 14:21:22 +0000
@@ -219,6 +219,19 @@
         '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([
+<<<<<<< TREE
+            ('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."""),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""The selected pricelist will provide suggested prices for products, and its currency will determine the currency of the sale order.If prices from multiple pricelists need to be mixed, select the appropriate pricelist before adding the corresponding products. \nWarning: do not mix different pricelists with different currencies in particular sales order lines, as that would likely result in incorrect prices!"""),
+=======
             ('prepaid', 'Pay before delivery'),
             ('manual', 'Deliver & invoice on demand'),
             ('picking', 'Invoice based on deliveries'),
@@ -230,6 +243,7 @@
   - 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."),
+>>>>>>> MERGE-SOURCE
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),