From 5c710c45581bf8f42958bb445261c6db2e36a007 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 22 Oct 2012 12:09:59 +0530 Subject: [PATCH 1/6] [IMP]chained location invisible if its type is not fixed bzr revid: sgo@tinyerp.com-20121022063959-1orhrlwbcuuwm7u3 --- addons/stock/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 329425148c5..26594159bff 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -540,7 +540,7 @@ - + From 74bb979f1909d449a71eea0bfa08255c713f2e36 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 22 Oct 2012 12:22:31 +0530 Subject: [PATCH 2/6] [IMP]Stock Valuation Account (Incoming)/(Outgoing) are readonly when type is not inventory/production, we should hide these fields if type is not inventory/production bzr revid: sgo@tinyerp.com-20121022065231-4f4piutou72z6v90 --- addons/stock/stock_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 26594159bff..20ab3aaec9b 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -551,9 +551,9 @@ - - - + + + From 40a104c86b80b41513182b1157dc0f696db1a1f0 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 22 Oct 2012 12:45:41 +0530 Subject: [PATCH 3/6] [IMP]recording rules min max quantity tool tip changed bzr revid: sgo@tinyerp.com-20121022071541-raldjq28nztav9nv --- addons/procurement/procurement.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index b21cef30773..56e38529ee6 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -561,10 +561,10 @@ class stock_warehouse_orderpoint(osv.osv): 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_min_qty': fields.float('Minimum Quantity', required=True, help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\ - "a procurement to bring the virtual stock to the Max Quantity."), + "a procurement to bring the Forecasted Quantity to the Max Quantity."), 'product_max_qty': fields.float('Maximum Quantity', required=True, help="When the virtual stock goes below the Min Quantity, OpenERP generates "\ - "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."), + "a procurement to bring the Forecasted Quantity to the Quantity specified as Max Quantity."), 'qty_multiple': fields.integer('Qty Multiple', required=True, help="The procurement quantity will be rounded up to this multiple."), 'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"), From 7246454c708f3bb79204ede2fd5cbf16f16c1f8b Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 22 Oct 2012 15:11:42 +0530 Subject: [PATCH 4/6] [IMP]when create new delivery order and on click of save it gives traceback bzr revid: sgo@tinyerp.com-20121022094142-kbr4rtic238to00w --- addons/stock/stock.py | 2 +- addons/stock/stock_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 765599aa842..8ff09266b2b 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -629,7 +629,7 @@ class stock_picking(osv.osv): 'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True), 'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True), - 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."), + 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."), 'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \ diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 20ab3aaec9b..4d05c56f8e5 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -784,7 +784,7 @@ - + From 2b9382613250102824df4641bccf2fd6ec1e6493 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 29 Oct 2012 18:24:26 +0530 Subject: [PATCH 5/6] [IMP]string chaged future > forcasted bzr revid: sgo@tinyerp.com-20121029125426-ux5wyihy6nbzlke5 --- addons/stock/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index 94252f80439..a9e98abae37 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -373,7 +373,7 @@ class product_product(osv.osv): "typed as 'internal'."), 'virtual_available': fields.function(_product_available, multi='qty_available', type='float', digits_compute=dp.get_precision('Product Unit of Measure'), - string='Future Quantity', + string='Forecasted Quantity', help="Forecast quantity (computed as Quantity On Hand " "- Outgoing + Incoming)\n" "In a context with a single Stock Location, this includes " From 7867148b92a1ed32e9211843e39604fc96cf9d25 Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Tue, 30 Oct 2012 11:35:34 +0530 Subject: [PATCH 6/6] typo bzr revid: apa@tinyerp.com-20121030060534-y20e0xocy9pe1jx4 --- addons/stock/product_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index f71b42300fb..73064b3c36e 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -219,7 +219,7 @@
  • On hand:
    • -
  • Available:
    • +
  • Forecasted Quantity: