Modifs
bzr revid: fp@tinyerp.com-a8fd2fdce67c9231c7b184d1bbc682a9d9bde7ea
This commit is contained in:
Fabien Pinckaers
parent
8a58c7e5b4
commit
a878b54f0b
|
|
@ -15,17 +15,12 @@
|
|||
<blockValign value="TOP"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Tableau2">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="white"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" />
|
||||
<lineStyle kind="OUTLINE" colorName="#e6e6e6" />
|
||||
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
|
||||
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
|
||||
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
|
||||
<blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
|
||||
<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
|
||||
<blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
|
||||
<blockAlignment value="LEFT" start="0,0" stop="0,-1"/>
|
||||
<blockAlignment value="CENTER" start="1,0" stop="-1,0"/>
|
||||
<blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0" />
|
||||
<lineStyle kind="LINEBELOW" colorName="#e0e0e0" start="0,1" stop="-1,-2" />
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Tableau3">
|
||||
<blockAlignment value="LEFT"/>
|
||||
|
|
@ -48,60 +43,66 @@
|
|||
</blockTableStyle>
|
||||
|
||||
<blockTableStyle id="Tableau7">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" />
|
||||
<blockBackground colorName="#e6e6e6" start="0,0" stop="-1,0"/>
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="LINEABOVE" colorName="#cccccc" />
|
||||
<lineStyle kind="LINEBELOW" colorName="#cccccc" />
|
||||
<lineStyle kind="LINEAFTER" colorName="#cccccc" />
|
||||
<lineStyle kind="LINEBEFORE" colorName="#cccccc" />
|
||||
<blockBackground colorName="#e0e0e0" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
|
||||
<initialize>
|
||||
<paraStyle name="all" alignment="justify"/>
|
||||
</initialize>
|
||||
<paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/>
|
||||
<paraStyle name="P2" fontName="Times-Roman"/>
|
||||
<paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/>
|
||||
<paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/>
|
||||
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11"/>
|
||||
<paraStyle name="P2" fontName="Helvetica"/>
|
||||
<paraStyle name="P3" fontName="Helvetica" alignment="LEFT"/>
|
||||
<paraStyle name="P4" fontName="Helvetica" alignment="LEFT"/>
|
||||
<paraStyle name="P5" fontName="Times-Bold" fontSize="9.0" leading="11"/>
|
||||
<paraStyle name="P6" fontName="Times-Bold" fontSize="9.0" leading="11"/>
|
||||
<paraStyle name="P7" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
|
||||
<paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P10" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
|
||||
<paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P10" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" leftIndent="10"/>
|
||||
<paraStyle name="P11" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P12" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P13" fontName="Times-Bold" fontSize="9.0" leading="11"/>
|
||||
<paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="13"/>
|
||||
<paraStyle name="P15" fontName="Times-Roman" fontSize="10.0" leading="13"/>
|
||||
<paraStyle name="P16" fontName="Times-Roman" fontSize="4.0" leading="5"/>
|
||||
<paraStyle name="P17" fontName="Times-Roman" fontSize="4.0" leading="5"/>
|
||||
<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P20" fontName="Times-Roman" fontSize="16.0" leading="20"/>
|
||||
<paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
|
||||
<paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
|
||||
<paraStyle name="P16" fontName="Helvetica" fontSize="4.0" leading="5"/>
|
||||
<paraStyle name="P17" fontName="Helvetica" fontSize="4.0" leading="5"/>
|
||||
<paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P19" fontName="Helvetica" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P20" fontName="Helvetica" fontSize="16.0" leading="20"/>
|
||||
<paraStyle name="P21" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
|
||||
<paraStyle name="P22" fontName="Times-Roman" fontSize="7.0" leading="9"/>
|
||||
<paraStyle name="P23" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P24" fontName="Times-Roman" fontSize="7.0" leading="9"/>
|
||||
<paraStyle name="P25" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P26" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9"/>
|
||||
<paraStyle name="P23" fontName="Helvetica" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9"/>
|
||||
<paraStyle name="P25" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P25b" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
|
||||
<paraStyle name="P27" fontName="Times-Bold" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P27b" fontName="Helvetica" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P28" fontName="Times-BoldItalic" fontSize="11.0" leading="14" alignment="CENTER"/>
|
||||
<paraStyle name="P29" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P30" fontName="Times-Roman" fontSize="9.0" leading="14"/>
|
||||
<paraStyle name="P31" fontName="Times-Roman" fontSize="9.0" leading="14"/>
|
||||
<paraStyle name="P32" fontName= "Helvetica" fontSize="9.0" leading="13"/>
|
||||
<paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="14"/>
|
||||
<paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="14"/>
|
||||
<paraStyle name="P32" fontName= "Helvetica" fontSize="9.0" leading="13" alignment="RIGHT"/>
|
||||
<paraStyle name="P32a" fontName= "Helvetica" fontSize="9.0" leading="13"/>
|
||||
|
||||
<paraStyle name="Standard" fontName="Times-Roman"/>
|
||||
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Standard" fontName="Helvetica"/>
|
||||
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Table Contents" fontName="Times-Roman"/>
|
||||
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
|
||||
<paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Index" fontName="Times-Roman"/>
|
||||
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Table Contents" fontName="Helvetica"/>
|
||||
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
|
||||
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Index" fontName="Helvetica"/>
|
||||
</stylesheet>
|
||||
<images/>
|
||||
<story>
|
||||
<para style="P1">[[ repeatIn(objects,'o') ]] <font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font>
|
||||
<para style="P1">[[ repeatIn(objects,'o') ]] <font face="Helvetica">[[ setLang(o.partner_id.lang) ]]</font>
|
||||
</para>
|
||||
<blockTable colWidths="257.0,50.0,220.0" style="Tableau1">
|
||||
<tr>
|
||||
|
|
@ -112,7 +113,7 @@
|
|||
<para style="P14">[[ o.partner_shipping_id.street ]]</para>
|
||||
<para style="P14">[[ o.partner_shipping_id.street2 or '' ]]</para>
|
||||
<para style="P15">
|
||||
<font face="Times-Roman">[[ o.partner_shipping_id.zip or '' ]]</font> [[ o.partner_shipping_id.city or '' ]]</para>
|
||||
<font face="Helvetica">[[ o.partner_shipping_id.zip or '' ]]</font> [[ o.partner_shipping_id.city or '' ]]</para>
|
||||
<para style="P15">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]]</para>
|
||||
<para style="P15">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
|
||||
<para style="P16">
|
||||
|
|
@ -155,30 +156,30 @@
|
|||
<blockTable colWidths="132.0,132.0,132.0,132.0" style="Tableau7">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P27">Your order reference </para>
|
||||
<para style="P27b">Your Reference </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P27">Date ordered </para>
|
||||
<para style="P27b">Date Ordered </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P27">Our salesman </para>
|
||||
<para style="P27b">Our Salesman </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P27">Payment </para>
|
||||
<para style="P27b">Payment Terms</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P32">[[ o.client_order_ref ]]</para>
|
||||
<para style="P32a">[[ o.client_order_ref ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ o.date_order ]]</para>
|
||||
<para style="P32a">[[ o.date_order ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ o.user_id.name ]]</para>
|
||||
<para style="P32a">[[ o.user_id.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ o.client_ref and o.client_ref.property_payment_term and o.client_ref.property_payment_term[0] and o.client_ref.property_payment_term[0].name ]] </para>
|
||||
<para style="P32a">[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or False ]] </para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -201,55 +202,39 @@
|
|||
<para style="P27">Unit Price</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P27">
|
||||
<font face="Times-Roman">Disc. (%)</font>
|
||||
</para>
|
||||
<para style="P27">Disc. (%)</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P27">Price</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<section>
|
||||
<para style="P21">[[ repeatIn(o.order_line,'line') ]]</para>
|
||||
<blockTable colWidths="256.0,46.0,56.0,59.0,56.0,54.0" style="Tableau3">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P32">[[ line.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ ', '.join(map(lambda x: x.name, line.tax_id))]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.price_unit ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ (line.discount and str(line.discount)+'%')or '' ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.price_subtotal ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P21">[[ repeatIn(o.order_line,'line') ]]</para>
|
||||
<para style="P32a">[[ line.name ]]</para>
|
||||
<para style="P10">[[ repeatIn((line.notes and line.notes.split('\n')) or [], 'l', 'para') ]]<i>[[ l ]]</i></para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ ', '.join(map(lambda x: x.name, line.tax_id))]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.price_unit ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ (line.discount and str(line.discount)+'%')or '' ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P32">[[ line.price_subtotal ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<blockTable colWidths="52.0,366.0,110.0" style="Tableau5">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P10">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P11">[[ l or removeParentNode('table') ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P10">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</section>
|
||||
|
||||
|
||||
<condPageBreak height="2.5cm"/>
|
||||
|
||||
<blockTable colWidths="362.0,69.0,95.0" style="Tableau6">
|
||||
<tr>
|
||||
<td>
|
||||
|
|
@ -286,10 +271,10 @@
|
|||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P12">TOTAL :</para>
|
||||
<para style="P25">Total :</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P12">[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
|
||||
<para style="P25b">[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
Loading…
Reference in New Issue