projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d586e40)
Note Prob Solved in purchase order and req for quotation
authorapa-tiny <patelamit2003@gmail.com>
Wed, 10 Sep 2008 13:51:25 +0000 (19:21 +0530)
committerapa-tiny <patelamit2003@gmail.com>
Wed, 10 Sep 2008 13:51:25 +0000 (19:21 +0530)
bzr revid: patelamit2003@gmail.com-20080910135125-vjmxehwqx7xz7556

addons/purchase/report/order.rml patch | blob | history
addons/purchase/report/request_quotation.rml patch | blob | history

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 689a941..8c5ab1c 100644 (file)
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -95,8 +95,8 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -141,32 +141,32 @@
         <td>
           <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name  ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
           <para style="terp_default_9">[[ addr.street ]]</para>
           <para style="terp_default_9">[[ addr.street2 or '' ]]</para>
-          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or ''  ]]</para>
-          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or ''  ]]</para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font> [[ addr.city or '' ]]</para>
+          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para>
           <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.zip or ''  ]][[ o.partner_address_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
           <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
-          <para style="terp_default_9">TVA :[[ o.partner_id.vat or ''  ]]</para>
+          <para style="terp_default_9">TVA :[[ o.partner_id.vat or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and ''  ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
+    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -195,13 +195,13 @@
           <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.partner_ref or ''  ]]</para>
+          <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or ''  ]]</para>
+          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -244,7 +244,7 @@
             <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">[[ 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>
@@ -258,8 +258,7 @@
         </tr>
         <tr>
           <td>
-            <para style="terp_default_2">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
-            <para style="P3">[[ l or removeParentNode('table') ]]</para>
+            <para style="P2">[[ line.notes or removeParentNode('tr') ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -308,7 +307,7 @@
           <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>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
@@ -324,7 +323,7 @@
           <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>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
@@ -334,7 +333,7 @@
           </para>
         </td>
         <td>
-          <para style="P2">Total :</para>
+          <para style="P3">Total :</para>
         </td>
         <td>
           <para style="terp_default_Bold_9_Right">[[ o.amount_total ]]</para>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 6b39f70..8682fd7 100644 (file)
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -29,14 +29,11 @@
       <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="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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -68,6 +65,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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" 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_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -100,30 +98,20 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Request for quotation : [[order.name]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_header">Request for quotation : [[order.name]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">Please find hereby a request for quotation.</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="391.0,66.0,73.0" repeatRows="1" style="Table_Product_Header_Title">
+    <blockTable colWidths="387.0,83.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Date</para>
+          <para style="terp_tblheader_Details_Centre">Expected Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Qty</para>
@@ -132,13 +120,13 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
-      <blockTable colWidths="402.0,67.0,38.0,23.0" style="Table_Product_Line">
+      <blockTable colWidths="388.0,83.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para>
+            <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ order_line.product_qty or '' ]]</para>
@@ -149,23 +137,7 @@
         </tr>
         <tr>
           <td>
-            <para style="terp_default_2">[[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]]</para>
-            <para style="P1">[[ l or removeParentNode('table') ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_2">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_2">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_2">
-              <font color="white"> </font>
-            </para>
+            <para style="P1">[[ order_line.notes or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -173,11 +145,15 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ order.notes or '' ]]</para>
+    <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">Thanks,</para>
+    <para style="terp_default_9">Regards,</para>
+    <para style="terp_default_9">[[ user.name or '' ]]</para>
+    <para style="terp_default_Bold_8">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
Unnamed repository; edit this file 'description' to name the repository.