Saurang Suthar(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-930209-ssu into lp:openobject-addons.
Requested reviews: OpenERP Core Team (openerp) Related bugs: Bug #930209 in OpenERP Addons: "Packing list adds quantities without verifying UoMs" https://bugs.launchpad.net/openobject-addons/+bug/930209 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-930209-ssu/+merge/109560 Hello sir, I have fixed the issue of standard report for pickings. Thank you. Saurang - ssu -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-930209-ssu/+merge/109560 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-930209-ssu.
=== modified file 'stock/report/picking.rml' --- stock/report/picking.rml 2012-05-22 16:10:55 +0000 +++ stock/report/picking.rml 2012-06-11 04:55:26 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="Packing List.pdf"> - <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A.([email protected])" allowSplitting="20"> +<document filename="test.pdf"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/> </pageTemplate> @@ -85,15 +85,10 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> - <blockTableStyle id="Table2"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> - </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> + <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Helvetica"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> @@ -129,28 +124,6 @@ <images/> </stylesheet> <story> - <pto> - <pto_header> - <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header"> - <tr> - <td> - <para style="terp_tblheader_Details">Description</para> - </td> - <td> - <para style="terp_tblheader_Details_Centre">Lot</para> - </td> - <td> - <para style="terp_tblheader_Details_Centre">Status</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Location</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Quantity</para> - </td> - </tr> - </blockTable> - </pto_header> <para style="terp_default_8">[[repeatIn(objects,'picking')]] </para> <para style="terp_default_9"> <font color="white"> </font> @@ -161,13 +134,19 @@ <para style="terp_default_Bold_9">Supplier Address : [[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para> <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.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para> + <para style="P1">[[ picking.address_id and display_address(picking.address_id) ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </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.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para> + <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> </td> </tr> </blockTable> @@ -208,7 +187,7 @@ </td> </tr> </blockTable> - <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Content_Order_Reference_Table"> + <blockTable colWidths="100.0,100.0,108.0,108.0,109.0" style="Content_Order_Reference_Table"> <tr> <td> <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para> @@ -217,7 +196,7 @@ <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> + <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title.name) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para> </td> <td> <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para> @@ -239,7 +218,7 @@ <para style="terp_tblheader_Details_Centre">Lot</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> @@ -250,7 +229,7 @@ </tr> </blockTable> <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">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'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"> <tr> @@ -286,9 +265,7 @@ <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para> </td> <td> - <para style="terp_default_9">[[ (picking.type == 'in' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Received' or move_lines.state]]</para> - <para style="terp_default_9">[[ (picking.type == 'out' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Delivered' or move_lines.state]]</para> - <para style="terp_default_9">[[ (picking.type == 'internal' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Transferred' or move_lines.state]]</para> + <para style="terp_default_9">[[ move_lines.state ]]</para> </td> <td> <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para> @@ -299,24 +276,8 @@ </tr> </blockTable> </section> - <blockTable colWidths="388.0,56.0,77.0" style="Table2"> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_tblheader_Details_Centre">Total</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para> - </td> - </tr> - </blockTable> <para style="terp_default_2"> <font color="white"> </font> </para> - </pto> </story> </document> === modified file 'stock/report/picking.sxw' Binary files stock/report/picking.sxw 2012-05-16 16:01:15 +0000 and stock/report/picking.sxw 2012-06-11 04:55:26 +0000 differ === modified file 'stock/report/stock_inventory_move.rml' --- stock/report/stock_inventory_move.rml 2011-12-21 09:08:11 +0000 +++ stock/report/stock_inventory_move.rml 2012-06-11 04:55:26 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<document filename="Stock Inventory.pdf"> - <template title="Stock Inventory" author="OpenERP S.A.([email protected])" allowSplitting="20"> +<document filename="test.pdf"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> </pageTemplate> @@ -56,7 +56,7 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Table7"> + <blockTableStyle id="Table6"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> @@ -104,25 +104,6 @@ <images/> </stylesheet> <story> - <pto> - <pto_header> - <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4"> - <tr> - <td> - <para style="terp_tblheader_Details">Location</para> - </td> - <td> - <para style="terp_tblheader_Details_Centre">Production Lot</para> - </td> - <td> - <para style="terp_tblheader_Details">Product </para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Quantity</para> - </td> - </tr> - </blockTable> - </pto_header> <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para> <blockTable colWidths="539.0" style="Table3"> <tr> @@ -163,7 +144,7 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4"> + <blockTable colWidths="71.0,104.0,256.0,109.0" style="Table4"> <tr> <td> <para style="terp_tblheader_Details">Location</para> @@ -198,7 +179,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="383.0,47.0,109.0" style="Table7"> + <blockTable colWidths="383.0,47.0,109.0" style="Table6"> <tr> <td> <para style="terp_default_Bold_9"> @@ -216,6 +197,5 @@ <para style="terp_default_8"> <font color="white"> </font> </para> - </pto> </story> -</document> \ No newline at end of file +</document> === modified file 'stock/report/stock_inventory_move.sxw' Binary files stock/report/stock_inventory_move.sxw 2011-01-14 00:11:01 +0000 and stock/report/stock_inventory_move.sxw 2012-06-11 04:55:26 +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
