From d8e77bd5e5ee2e7e7ab5426cf288c7514a4b17ff Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Fri, 18 Nov 2011 15:26:18 +0530 Subject: [PATCH 1/4] [imp]improved warhouse bzr revid: han@tinyerp.com-20111118095618-e4zouw1ee4usabeg --- addons/product/product_data.xml | 2 +- addons/stock/board_warehouse_view.xml | 8 +++---- addons/stock/stock_view.xml | 21 ++++++++++--------- .../wizard/stock_partial_picking_view.xml | 10 ++------- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index fc085aab922..e5c16bfa67b 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -57,7 +57,7 @@ - tonne + t bigger diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 68485ab2b49..b171515a8db 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -2,7 +2,7 @@ - Incoming Product + Incoming Shipments stock.move ir.actions.act_window form @@ -12,7 +12,7 @@ - Outgoing Product + Delivery Orders stock.move ir.actions.act_window form @@ -47,8 +47,8 @@
- - + + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 8e3450708eb..c1b174a8dc7 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1022,8 +1022,8 @@ - - + + @@ -1239,7 +1239,7 @@ - + @@ -1277,7 +1277,7 @@ [('type','=','in')] {'contact_display': 'partner_address',"search_default_available":1} - The Incoming Shipments is the list of all orders you will receive from your supplier. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. + The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1305,8 +1305,8 @@ - - + + @@ -1670,7 +1670,8 @@ - + + @@ -1702,7 +1703,7 @@ - + @@ -1735,7 +1736,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. @@ -1870,7 +1871,7 @@ tree,form ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')] - + You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field). diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index be85d266673..f3be24b786f 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -36,10 +36,7 @@ - - - - + @@ -54,10 +51,7 @@ - - - - + From 7bce46254462c353a75b8ed3d6a7b025261de786 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Mon, 21 Nov 2011 18:22:39 +0530 Subject: [PATCH 2/4] [imp] made dashboard working in web-client bzr revid: han@tinyerp.com-20111121125239-buqve72s07s2a7nn --- addons/procurement/board_mrp_procurement_view.xml | 2 +- addons/stock/board_warehouse_view.xml | 4 ++-- addons/stock/wizard/stock_partial_picking_view.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml index b45edd3cbdd..01745e7acff 100644 --- a/addons/procurement/board_mrp_procurement_view.xml +++ b/addons/procurement/board_mrp_procurement_view.xml @@ -16,7 +16,7 @@ form - + diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index b171515a8db..86cf62d5a03 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -28,7 +28,7 @@ graph,tree [('type','=','in'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - {'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1} + {'search_default_in':1}
Outgoing Products Delay @@ -37,7 +37,7 @@ graph,tree [('type','=','out'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - {'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1} + {'search_default_out':1} board.warehouse.form diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index f3be24b786f..39b993b7d7d 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -36,7 +36,7 @@ - + @@ -51,7 +51,7 @@ - + From 9d3acf6de242ac9d851c9f07ec0973461b0a4a82 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 22 Nov 2011 10:56:21 +0530 Subject: [PATCH 3/4] [imp] set field tracking serial to production lot bzr revid: han@tinyerp.com-20111122052621-artudqoysj0kybf0 --- addons/stock/wizard/stock_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py index 9ff0c96a3b8..c692181a1e2 100644 --- a/addons/stock/wizard/stock_move.py +++ b/addons/stock/wizard/stock_move.py @@ -254,7 +254,7 @@ class stock_move_split_lines_exist(osv.osv_memory): _name = "stock.move.split.lines" _description = "Stock move Split lines" _columns = { - 'name': fields.char('Tracking serial', size=64), + 'name': fields.char('Production Lot', size=64), 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')), 'wizard_id': fields.many2one('stock.move.split', 'Parent Wizard'), 'wizard_exist_id': fields.many2one('stock.move.split', 'Parent Wizard (for existing lines)'), From 6965127b25ce9bc87f276a1dc83a84fd38443436 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 22 Nov 2011 15:39:07 +0530 Subject: [PATCH 4/4] [imp] added decimal_precision on quantity field in order to get three number after coma bzr revid: han@tinyerp.com-20111122100907-r0c8p82xuwlk9z0p --- addons/stock/wizard/stock_partial_picking.py | 3 ++- addons/stock/wizard/stock_return_picking.py | 3 ++- addons/stock/wizard/stock_splitinto.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index f6ecb6511eb..f666bf1e367 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -22,13 +22,14 @@ import time from osv import fields, osv from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT +import decimal_precision as dp class stock_partial_picking_line(osv.TransientModel): _name = "stock.partial.picking.line" _rec_name = 'product_id' _columns = { 'product_id' : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'), - 'quantity' : fields.float("Quantity", required=True), + 'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True), 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'), 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot', ondelete='CASCADE'), 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE'), diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index b7c8aa28354..689f17cd9b9 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -24,13 +24,14 @@ import time from osv import osv,fields from tools.translate import _ +import decimal_precision as dp class stock_return_picking_memory(osv.osv_memory): _name = "stock.return.picking.memory" _rec_name = 'product_id' _columns = { 'product_id' : fields.many2one('product.product', string="Product", required=True), - 'quantity' : fields.float("Quantity", required=True), + 'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True), 'wizard_id' : fields.many2one('stock.return.picking', string="Wizard"), 'move_id' : fields.many2one('stock.move', "Move"), } diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py index 1f48c8cfc19..3ed7c39318d 100644 --- a/addons/stock/wizard/stock_splitinto.py +++ b/addons/stock/wizard/stock_splitinto.py @@ -27,7 +27,7 @@ class stock_split_into(osv.osv_memory): _name = "stock.split.into" _description = "Split into" _columns = { - 'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UOM')), + 'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UoM')), } _defaults = { 'quantity': lambda *x: 0,