Purchase Order Completed.

%2f% Removed...
Note Prob solved...
Remove Product Column...
Solved Order Ref Error..

bzr revid: patelamit2003@gmail.com-20080909091513-8siw2t6by2p5yxhd

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index a3db53e..df7cdcb 100644 (file)
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -57,7 +57,6 @@
       <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="Table_Order_Pur_line_Content">
       <blockAlignment value="LEFT"/>
@@ -69,7 +68,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
@@ -77,7 +75,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
@@ -130,6 +127,7 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -187,7 +185,7 @@
     <blockTable colWidths="136.0,132.0,133.0,133.0" style="Content_Order_Reference_Table">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ o.ref or '' ]]</para>
+          <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ o.partner_ref or ''  ]]</para>
@@ -203,12 +201,9 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="44.0,210.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Product</para>
-        </td>
-        <td>
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
@@ -230,12 +225,9 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
-      <blockTable colWidths="44.0,211.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="254.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para>
-          </td>
-          <td>
             <para style="terp_default_9">[[ line.name ]]</para>
           </td>
           <td>
@@ -245,23 +237,21 @@
             <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para>
+            <para style="terp_default_Right_9">[[ line.product_qty ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para>
+            <para style="terp_default_Right_9">[[ line.price_unit ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal  ]]</para>
+            <para style="terp_default_Right_9">[[ line.price_subtotal ]]</para>
           </td>
         </tr>
         <tr>
           <td>
-            <para style="terp_default_8_Italic">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
-          </td>
-          <td>
+            <para style="terp_default_2">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
             <para style="terp_default_8_Italic">[[ l or removeParentNode('table') ]]</para>
           </td>
           <td>
@@ -308,7 +298,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed  ]]</para>
+          <para style="terp_default_Right_9">[[ o.amount_untaxed ]]</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
@@ -324,7 +314,7 @@
           <para style="P1">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax  ]]</para>
+          <para style="terp_default_Right_9">[[ o.amount_tax ]]</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
@@ -340,7 +330,7 @@
           <para style="P2">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ o.amount_total ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para>