ajay javiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons20-stock-tpa-fix-aja into
lp:~openerp-dev/openobject-addons/trunk-addons20-stock-tpa.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-stock-tpa-fix-aja/+merge/133184
Hello,
Improve code in delivery slip report of warehouse.
Rename in report
-> Receipt slip to Delivery Slip.
-> Expected Shipping Date to Scheduled Date.
Remove in Report
-> space before and after code.
->column for recipient.
Add in Report
-> streets and phone/email details on partner
-> Fix traceback.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-stock-tpa-fix-aja/+merge/133184
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons20-stock-tpa.
=== modified file 'stock/report/picking.py'
--- stock/report/picking.py 2012-06-11 08:46:28 +0000
+++ stock/report/picking.py 2012-11-07 05:18:20 +0000
@@ -29,7 +29,11 @@
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:
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2012-06-11 07:08:45 +0000
+++ stock/report/picking.rml 2012-11-07 05:18:20 +0000
@@ -162,12 +162,14 @@
<para style="terp_default_Bold_9">Customer Address : [[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
<para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
<para style="terp_default_9">[[ (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 ]]</para>
- <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'delivery') ]]</para>
+ <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
+ <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Contact Address :</para>
<para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
- <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'default') ]] </para>
+ <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
+ <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
</td>
</tr>
</blockTable>
@@ -189,7 +191,7 @@
<para style="terp_default_5cm_Above_Space">
<font color="white"> </font>
</para>
- <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Header_Order_Reference_Tbl">
+ <blockTable colWidths="100.0,154.0,161.0,109.0" style="Header_Order_Reference_Tbl">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Journal</para>
@@ -198,17 +200,14 @@
<para style="terp_tblheader_General_Centre">Order(Origin)</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Recipient</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
+ <para style="terp_tblheader_General_Centre">Schedule Date</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Weight</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Content_Order_Reference_Table">
+ <blockTable colWidths="100.0,154.0,162.0,109.0" style="Content_Order_Reference_Table">
<tr>
<td>
<para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
@@ -217,9 +216,6 @@
<para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ (picking.partner_id and picking.partner_id.title.name) or '' ]] [[ (picking.partner_id and picking.partner_id.name) or '' ]] </para>
- </td>
- <td>
<para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
</td>
<td>
@@ -236,10 +232,10 @@
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Lot</para>
+ <para style="terp_tblheader_Details_Centre">Serial Number</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Status</para>
+ <para style="terp_tblheader_Details_Centre">State</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Location</para>
@@ -255,7 +251,8 @@
<blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
<tr>
<td>
- <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
+ <para style="terp_default_2">[[ repeatIn(get_productdesc(move_lines),'desc') ]]</para>
+ <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font><font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
</td>
<td>
<para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
=== modified file 'stock/report/picking.sxw'
Binary files stock/report/picking.sxw 2012-06-11 07:08:45 +0000 and stock/report/picking.sxw 2012-11-07 05:18:20 +0000 differ
=== modified file 'stock/stock_report.xml'
--- stock/stock_report.xml 2012-05-16 16:01:15 +0000
+++ stock/stock_report.xml 2012-11-07 05:18:20 +0000
@@ -3,7 +3,7 @@
<data>
<report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
<report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking Slip" rml="stock/report/picking.rml"/>
- <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Receipt Slip" rml="stock/report/picking.rml"/>
+ <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
<report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
<report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
<report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
