rml modified

bzr revid: nel@silver-20080909140833-4ca6zq1m646romba
This commit is contained in:
Najlaa
2008-09-09 16:08:33 +02:00
parent 4ce5db1263
commit a497e0f490
3 changed files with 18 additions and 12 deletions
+6 -6
View File
@@ -160,13 +160,13 @@
<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">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>
</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>
@@ -208,7 +208,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
<blockTable colWidths="232.0,44.0,60.0,69.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -232,7 +232,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
<blockTable colWidths="254.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
<blockTable colWidths="231.0,46.0,59.0,51.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
<tr>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
+4 -4
View File
@@ -117,7 +117,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="424.0,62.0,45.0" repeatRows="1" style="Table_Product_Header_Title">
<blockTable colWidths="391.0,66.0,73.0" repeatRows="1" style="Table_Product_Header_Title">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -132,7 +132,7 @@
</blockTable>
<section>
<para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
<blockTable colWidths="425.0,60.0,33.0,13.0" style="Table_Product_Line">
<blockTable colWidths="402.0,67.0,38.0,23.0" style="Table_Product_Line">
<tr>
<td>
<para style="terp_default_9">[[ order_line.name ]]</para>
@@ -141,10 +141,10 @@
<para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ order_line.product_qty or '' ]]</para>
<para style="terp_default_Right_9">[[ order_line.product_qty or '' ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
<para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
</td>
</tr>
<tr>
+8 -2
View File
@@ -77,6 +77,8 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Courier" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -107,6 +109,7 @@
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<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_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Preformatted Text" fontName="Courier" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
@@ -171,12 +174,15 @@
</td>
<td>
<para style="terp_default_Centre_9">[[ picking.name ]]</para>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ picking.date ]]</para>
<para style="P3">[[time.strftime('%d/%m/%Y', time.strptime(picking.min_date, '%Y-%m-%d')) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[time.strftime('%Y-%m-%d', time.strptime(picking.min_date, '%Y-%m-%d')) ]]</para>
<para style="P3">[[time.strftime('%d/%m/%Y %H:%M:%S ', time.strptime(picking.date, '%Y-%m-%d %H:%M:%S')) ]]</para>
</td>
</tr>
</blockTable>