Ravi Gohil (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-576397-rgo into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-576397-rgo/+merge/119864
Hello,
Currently, 'Packing List' and 'Quotation / Order' reports of stock.picking and
sale.orders objects does not display product packaging information.
This fix will show this information, kindly review the fix.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-576397-rgo/+merge/119864
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-576397-rgo.
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2012-05-24 12:51:39 +0000
+++ sale/report/sale_order.rml 2012-08-16 08:58:33 +0000
@@ -57,6 +57,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@@ -130,7 +131,7 @@
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<pto_header>
- <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
+ <blockTable colWidths="170.0,56.0,65.0,64.0,65.0,49.0,65.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -139,6 +140,9 @@
<para style="terp_tblheader_Details_Centre">VAT</para>
</td>
<td>
+ <para style="terp_tblheader_Details_Centre">Packaging</para>
+ </td>
+ <td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
@@ -233,7 +237,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
+ <blockTable colWidths="170.0,56.0,65.0,64.0,65.0,49.0,65.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -242,6 +246,9 @@
<para style="terp_tblheader_Details_Centre">VAT</para>
</td>
<td>
+ <para style="terp_tblheader_Details_Centre">Packaging</para>
+ </td>
+ <td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
@@ -257,7 +264,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
- <blockTable colWidths="180.0,70.0,80.0,70.0,50.0,85.0" style="Table5">
+ <blockTable colWidths="171.0,57.0,65.0,64.0,72.0,36.0,70.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ line.name ]] </para>
@@ -266,6 +273,9 @@
<para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
</td>
<td>
+ <para style="terp_default_Centre_9">[[ line.product_packaging.ul.name or '' ]]</para>
+ </td>
+ <td>
<para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
</td>
<td>
=== modified file 'sale/report/sale_order.sxw'
Binary files sale/report/sale_order.sxw 2011-05-10 09:14:36 +0000 and sale/report/sale_order.sxw 2012-08-16 08:58:33 +0000 differ
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2012-05-24 11:07:45 +0000
+++ stock/report/picking.rml 2012-08-16 08:58:33 +0000
@@ -69,6 +69,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Move_Line_Contect_Assign_State">
<blockAlignment value="LEFT"/>
@@ -78,6 +79,7 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@@ -134,7 +136,7 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+ <blockTable colWidths="200.0,73.0,59.0,59.0,56.0,71.0" repeatRows="1" style="Move_Line_Header">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -149,6 +151,9 @@
<para style="terp_tblheader_Details_Right">Location</para>
</td>
<td>
+ <para style="terp_tblheader_Details_Centre">Packaging</para>
+ </td>
+ <td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
@@ -231,7 +236,7 @@
<para style="terp_default_5cm_Above_Space">
<font color="white"> </font>
</para>
- <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+ <blockTable colWidths="200.0,73.0,59.0,59.0,56.0,71.0" repeatRows="1" style="Move_Line_Header">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -246,6 +251,9 @@
<para style="terp_tblheader_Details_Right">Location</para>
</td>
<td>
+ <para style="terp_tblheader_Details_Centre">Packaging</para>
+ </td>
+ <td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
@@ -253,7 +261,7 @@
<section>
<para style="terp_default_2">[[ 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') ]]</para>
<para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
- <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
+ <blockTable colWidths="200.0,74.0,58.0,60.0,56.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> <font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
@@ -268,6 +276,9 @@
<para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
</td>
<td>
+ <para style="terp_default_Centre_9">[[ move_lines.product_packaging.ul.name or '' ]]</para>
+ </td>
+ <td>
<para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para>
</td>
</tr>
@@ -278,7 +289,7 @@
<section>
<para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
<para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
- <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
+ <blockTable colWidths="200.0,74.0,57.0,61.0,56.0,72.0" style="Table1">
<tr>
<td>
<para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> <font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
@@ -293,6 +304,9 @@
<para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
</td>
<td>
+ <para style="terp_default_Centre_9">[[ move_lines.product_packaging.ul.name or '' ]]</para>
+ </td>
+ <td>
<para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para>
</td>
</tr>
=== modified file 'stock/report/picking.sxw'
Binary files stock/report/picking.sxw 2011-01-14 00:11:01 +0000 and stock/report/picking.sxw 2012-08-16 08:58:33 +0000 differ
_______________________________________________
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
