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

Proposed by Bharat Devnani (Open ERP)
Status: Rejected
Rejected by: Fabien (Open ERP)
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-782168-bde
Merge into: lp:openobject-addons
Diff against target: 31 lines (+14/-0)
1 file modified
sale/sale.py (+14/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-782168-bde
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+63699@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve
4731. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

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

Unmerged revisions

4731. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

4730. By Olivier Dony

[IMP] account : Improved the tooltip of pricelist_id

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale/sale.py'
2--- sale/sale.py 2011-09-15 13:56:13 +0000
3+++ sale/sale.py 2011-09-15 14:21:22 +0000
4@@ -219,6 +219,19 @@
5 'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
6 '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?"""),
7 'order_policy': fields.selection([
8+<<<<<<< TREE
9+ ('prepaid', 'Payment Before Delivery'),
10+ ('manual', 'Shipping & Manual Invoice'),
11+ ('postpaid', 'Invoice On Order After Delivery'),
12+ ('picking', 'Invoice From The Picking'),
13+ ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
14+ help="""The Shipping Policy is used to synchronise invoice and delivery operations.
15+ - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
16+ - 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.
17+ - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
18+ - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""),
19+ '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!"""),
20+=======
21 ('prepaid', 'Pay before delivery'),
22 ('manual', 'Deliver & invoice on demand'),
23 ('picking', 'Invoice based on deliveries'),
24@@ -230,6 +243,7 @@
25 - The 'Invoice on order after delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
26 - The 'Invoice based on deliveries' choice is used to create an invoice during the picking process."""),
27 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."),
28+>>>>>>> MERGE-SOURCE
29 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
30
31 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),

Subscribers

People subscribed via source and target branches

to all changes: