← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-765901-ron into lp:openobject-addons

 

Rohan Nayani(openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-765901-ron into lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-765901-ron/+merge/58928

sale:Add tooltip Regarding Push/Pull Flows
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-765901-ron/+merge/58928
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-765901-ron.
=== modified file 'sale/sale.py'
--- sale/sale.py	2011-02-22 09:27:33 +0000
+++ sale/sale.py	2011-04-25 06:38:29 +0000
@@ -853,7 +853,7 @@
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="'from stock': When needed, take from the stock or wait until re-supplying. 'on order': When needed, purchase or produce for the procurement request.If you are using Push/Pull flows than type must be 'on Order'"),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft': [('readonly', False)]}),

=== modified file 'stock_location/__openerp__.py'
--- stock_location/__openerp__.py	2011-03-25 10:24:13 +0000
+++ stock_location/__openerp__.py	2011-04-25 06:38:29 +0000
@@ -75,6 +75,8 @@
 the product being considered, but also depending on which location holds the "need" for that
 product (i.e. the destination location of that procurement order).
 
+* Pull/Push flows are only triggered when the sale order line is in 'on Order'
+
 Use-Case
 --------
 


Follow ups