<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"/>
<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>
+<<<<<<< TREE
+ <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'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<>'draft' or removeParentNode('font')) and '' ]] N° [[ o.name ]]</para>
+>>>>>>> MERGE-SOURCE
<para style="terp_default_8">
<font color="white"> </font>
</para>
<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>
<para style="terp_default_9">
<font color="white"> </font>
</para>
+<<<<<<< TREE
+ <blockTable colWidths="239.0,53.0,61.0,66.0,58.0,57.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">
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
+<<<<<<< TREE
+ <blockTable colWidths="239.0,53.0,61.0,47.0,20.0,57.0,58.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">
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
<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>
</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">
</tr>
</blockTable>
</section>
- <blockTable colWidths="415.0,57.0,42.0,20.0" style="Table_All_Total_Detail">
+ <blockTable colWidths="400.0,59.0,56.0,20.0" style="Table_All_Total_Detail">
<tr>
<td>
<para style="terp_default_9">
<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>
<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>
</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>