From 6785decc5a77b1a364b7c2e0e25dda1117a728f2 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 27 Jun 2013 15:25:47 +0200 Subject: [PATCH 1/3] [IMP] stock: WIP packaging bzr revid: qdp-launchpad@openerp.com-20130627132547-fw46onric52cm83f --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 82c03ec2d4a..5dce727f799 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1658,7 +1658,7 @@ class stock_picking(osv.osv): todo_on_operations = [] #check if the barcode correspond to a product - matching_product_ids = product_obj.search(cr, uid, ['|', ('code', '=', barcode_str), ('ean13', '=', barcode_str)], context=context) + matching_product_ids = product_obj.search(cr, uid, [('ean13', '=', barcode_str)], context=context) # TOCHECK: search on code too? if matching_product_ids: if len(matching_product_ids) > 1: error_msg = _('Wrong bar code detected: more than one product matching the given barcode') From 247602c506dcc1e05904291b27b26fe8f898757e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 27 Jun 2013 15:36:27 +0200 Subject: [PATCH 2/3] [WIP] stock: packaging bzr revid: qdp-launchpad@openerp.com-20130627133627-tyy2xm2d0vkj0ulc --- addons/stock/stock.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5dce727f799..f62e0a68869 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3808,9 +3808,13 @@ class stock_pack_operation(osv.osv): todo_on_moves = [] product_ids = self._find_product_ids(cr, uid, operation_id, context=context) for product_id in product_ids: - corresponding_move_id = stock_move_obj.search(cr, uid, [('picking_id', '=', picking_id), ('product_id', '=', product_id)], context=context)[0] # TODO: be safer - corresponding_move = stock_move_obj.browse(cr, uid, corresponding_move_id, context=context) - todo_on_moves += [(1, corresponding_move.id, {'remaining_qty': corresponding_move.product_qty - qty})] + corresponding_move_ids = stock_move_obj.search(cr, uid, [('picking_id', '=', picking_id), ('product_id', '=', product_id)], context=context) + if corresponding_move_ids: + corresponding_move = stock_move_obj.browse(cr, uid, corresponding_move_ids[0], context=context) + todo_on_moves += [(1, corresponding_move.id, {'remaining_qty': corresponding_move.product_qty - qty})] + else: + #decide what to do + pass return todo_on_moves, todo_on_operations # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fe8f2f043ec9ffca51a0aba10436d9759982763b Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 27 Jun 2013 15:49:43 +0200 Subject: [PATCH 3/3] [FIX]stock: fix stock picking report to add barcode and remove external header bzr revid: csn@openerp.com-20130627134943-wktq5gwzvlfxnqpm --- addons/stock/report/picking.py | 2 +- addons/stock/report/picking.rml | 36 ++++++++++++++------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 512d124ee0c..d9d306caefb 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -36,5 +36,5 @@ class picking(report_sxw.rml_parse): desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc return desc -report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking) +report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking, header='internal') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 0a17f56fc71..38dc7992a5d 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -66,6 +66,7 @@ + @@ -75,6 +76,7 @@ + @@ -84,6 +86,7 @@ + @@ -156,24 +159,6 @@ - - - - Supplier Address : [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] - Customer Address : [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] - Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] - [[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]] - [[ picking.partner_id and display_address(picking.partner_id) ]] - [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]] - - - Contact Address : - [[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]] - [[ picking.partner_id and display_address(picking.partner_id) ]] - [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]] - - - @@ -227,7 +212,7 @@ - + Description @@ -244,12 +229,15 @@ Quantity + + Barcode +
[[ repeatIn([line for line in picking.move_lines if ((line.state == 'confirmed' or line.state=='done' or line.state=='assigned') and not line.scrapped)],'move_lines') ]] [[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]] - + [[ get_product_desc(move_lines) ]] @@ -268,6 +256,9 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] + + [[ move_lines.product_id.ean13 ]] +
@@ -276,7 +267,7 @@
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] [[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]] - + [[ get_product_desc(move_lines) ]] @@ -295,6 +286,9 @@ [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]] + + [[ move_lines.product_id.ean13 ]] +