From a20daf7dfb4673099a38c22c8da41361bf93f59b Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Tue, 6 Nov 2012 15:01:57 +0530 Subject: [PATCH 1/5] [Fix]: Rename in delivery report bzr revid: aja@tinyerp.com-20121106093157-2hnhhv4murw4b9mh --- addons/stock/report/picking.rml | 6 +++--- addons/stock/stock_report.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 5f395c9f005..48aa5cffba0 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -201,7 +201,7 @@ Recipient - Expected Shipping Date + Scheduled Date Weight @@ -236,10 +236,10 @@ Description - Lot + Serial Number - Status + State Location diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index 540e6a8f902..c548317a3ba 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -3,7 +3,7 @@ - + From 7c263eb8b6c3c5a5b007458ac72caf809caf171c Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Tue, 6 Nov 2012 15:42:13 +0530 Subject: [PATCH 2/5] [REM]: Remove recipient from report bzr revid: aja@tinyerp.com-20121106101213-kvn880ory0bmmdpx --- addons/stock/report/picking.rml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 48aa5cffba0..1fc798fe5a4 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -162,12 +162,12 @@ 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,'delivery') ]] + [[ picking.partner_id and display_address(picking.partner_id) ]] 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,'default') ]] + [[ picking.partner_id and display_address(picking.partner_id) ]] @@ -189,7 +189,7 @@ - + Journal @@ -198,17 +198,14 @@ Order(Origin) - Recipient - - - Scheduled Date + Schedule Date Weight - + [[ picking.stock_journal_id.name]] @@ -216,9 +213,6 @@ [[ picking.origin or '']] - - [[ (picking.partner_id and picking.partner_id.title.name) or '' ]] [[ (picking.partner_id and picking.partner_id.name) or '' ]] - [[ formatLang(picking.min_date,date_time = True) ]] From 6293aa38a4d56a57557ee2dc7893f5ff88be2b35 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Tue, 6 Nov 2012 16:05:23 +0530 Subject: [PATCH 3/5] [ADD]: Add email or phone of partner in address bzr revid: aja@tinyerp.com-20121106103523-l0eb673k56dnzsjq --- addons/stock/report/picking.rml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 1fc798fe5a4..4e4abb72b0e 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -163,11 +163,13 @@ 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]] 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]] From a4c321e6892dcf2a6e13021070a1e24584290fcd Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Wed, 7 Nov 2012 10:39:33 +0530 Subject: [PATCH 4/5] [REM]:Remove whitespace from product description code in bracket bzr revid: aja@tinyerp.com-20121107050933-iu856szkvo6pekjk --- addons/stock/report/picking.py | 4 ++++ addons/stock/report/picking.rml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 29a53fba7a2..2956c5954eb 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -29,7 +29,11 @@ class picking(report_sxw.rml_parse): super(picking, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, + 'get_productdesc':self.get_productdesc }) + def get_productdesc(self,code): + code = '[' + code.product_id.default_code + ']' + return [code] report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 4e4abb72b0e..688f879f14e 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -251,7 +251,8 @@ - [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] + [[ repeatIn(get_productdesc(move_lines),'desc') ]] + [[ desc ]] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] From ab92877f406250cfa8e1a1f9e3cd2cc64e06bd6f Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Wed, 7 Nov 2012 11:39:12 +0530 Subject: [PATCH 5/5] [IMP]: Improve code in delivery report bzr revid: aja@tinyerp.com-20121107060912-qyrl4zgoqnbvwbjy --- addons/stock/report/picking.py | 10 ++++++---- addons/stock/report/picking.rml | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 2956c5954eb..71a45b06a35 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -29,11 +29,13 @@ class picking(report_sxw.rml_parse): super(picking, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, - 'get_productdesc':self.get_productdesc + 'get_product_desc':self.get_product_desc }) - def get_productdesc(self,code): - code = '[' + code.product_id.default_code + ']' - return [code] + def get_product_desc(self,move_line): + desc = move_line.product_id.name + if move_line.product_id.default_code: + 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) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 688f879f14e..dfb202b75ff 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -251,8 +251,8 @@ - [[ repeatIn(get_productdesc(move_lines),'desc') ]] - [[ desc ]] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] + [[ repeatIn(get_product_desc(move_lines),'desc') ]] + [[ desc ]] [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] @@ -277,7 +277,8 @@ - [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] + [[ repeatIn(get_product_desc(move_lines),'desc') ]] + [[ desc ]] [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]