bugfixes:invoice reports ref(gpa)
bzr revid: nch@tinyerp.com-20090522085001-somn2q42sb1ea4m4
This commit is contained in:
Naresh Choksy
parent
5d5dfcb5fc
commit
47dab5031e
|
|
@ -296,7 +296,7 @@
|
|||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="211.0,62.0,63.0,63.0,36.0,89.0" style="Table_Header_Invoice_Line">
|
||||
<blockTable colWidths="211.0,62.0,63.0,63.0,80.0,69.0" style="Table_Header_Invoice_Line">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details">Description</para>
|
||||
|
|
@ -465,7 +465,7 @@
|
|||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="54.0,58.0,67.0" style="Table_Tax_Header">
|
||||
<blockTable colWidths="54.0,80.0,67.0" style="Table_Tax_Header">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Centre">Tax</para>
|
||||
|
|
@ -486,10 +486,10 @@
|
|||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
|
||||
<blockTable colWidths="53.0,60.0,65.0" style="Table_Tax_Content">
|
||||
<blockTable colWidths="53.0,80.0,65.0" style="Table_Tax_Content">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Centre_8">[[ lt.description and lt.description + ' - ' + t.name or t.name ]] </para>
|
||||
<para style="terp_default_Centre_8">[[ t.name ]] </para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ msgstr "Zwischensumme"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Invoice Date:"
|
||||
msgstr "Rechnungsdatum:"
|
||||
|
||||
|
|
@ -43,6 +44,7 @@ msgstr "Rechungen mit Layout und Nachricht"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Disc. (%)"
|
||||
msgstr "Rabatt (%)"
|
||||
|
||||
|
|
@ -63,6 +65,7 @@ msgstr "Diese Mitteilung wird am Ende des Rechnungsformulars angezeigt."
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Unit Price"
|
||||
msgstr "Preis pro Einheit"
|
||||
|
||||
|
|
@ -78,6 +81,7 @@ msgstr "Zeige alle Meldungen an"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "PRO-FORMA"
|
||||
msgstr "PRO-FORMA"
|
||||
|
||||
|
|
@ -98,11 +102,13 @@ msgstr "Sende Nachricht"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Customer Ref:"
|
||||
msgstr "Kundenreferenz:"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Description"
|
||||
msgstr "Beschreibung"
|
||||
|
||||
|
|
@ -118,16 +124,19 @@ msgstr "Typ"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Price"
|
||||
msgstr "Preis"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Canceled Invoice"
|
||||
msgstr "Abgebrochene Rechnung"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Taxes:"
|
||||
msgstr "Steuern:"
|
||||
|
||||
|
|
@ -143,11 +152,13 @@ msgstr "Speichere Nachricht"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Base"
|
||||
msgstr "Basis"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Fax :"
|
||||
msgstr "Fax :"
|
||||
|
||||
|
|
@ -163,6 +174,7 @@ msgstr "Schreibe eine Benachrichtigung."
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Tel. :"
|
||||
msgstr "Tel. :"
|
||||
|
||||
|
|
@ -178,6 +190,7 @@ msgstr "Seitenwechsel"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Document:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -203,21 +216,25 @@ msgstr "Rechungen mit Layout"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Amount"
|
||||
msgstr "Betrag"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Total (excl. taxes):"
|
||||
msgstr "Gesamtsumme (excl. Steuern):"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Taxes"
|
||||
msgstr "Steuern"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Draft Invoice"
|
||||
msgstr "Rechnung Entwurf"
|
||||
|
||||
|
|
@ -228,16 +245,19 @@ msgstr "Sequenz Nummer"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Quantity"
|
||||
msgstr "Menge"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Refund"
|
||||
msgstr "Gutschrift"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "VAT :"
|
||||
msgstr "MWSt :"
|
||||
|
||||
|
|
@ -248,21 +268,25 @@ msgstr "Trennlinie"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Supplier Invoice"
|
||||
msgstr "Lieferantenrechnung"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Tax"
|
||||
msgstr "Steuer"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "(incl. taxes):"
|
||||
msgstr "(inkl. Steuer)"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Invoice"
|
||||
msgstr "Rechnung"
|
||||
|
||||
|
|
@ -273,6 +297,7 @@ msgstr "Abbruch"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Supplier Refund"
|
||||
msgstr "Lieferanten Gutschrift"
|
||||
|
||||
|
|
@ -283,6 +308,7 @@ msgstr "Nachricht"
|
|||
|
||||
#. module: account_invoice_layout
|
||||
#: rml:account.invoice.layout:0
|
||||
#: rml:notify_account.invoice:0
|
||||
msgid "Total"
|
||||
msgstr "Gesamt"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<blockTableStyle id="Tableau6">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<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"/>
|
||||
|
|
@ -46,6 +45,7 @@
|
|||
<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"/>
|
||||
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Tableau5">
|
||||
<blockAlignment value="LEFT"/>
|
||||
|
|
@ -61,10 +61,12 @@
|
|||
<paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P6" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P7" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="3.0" leading="8"/>
|
||||
<paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
|
||||
<paraStyle name="P8a" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
|
||||
<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
|
||||
<paraStyle name="P10" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P11" fontName="Times-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P11a" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P12" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P13" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P14" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
|
||||
|
|
@ -73,14 +75,15 @@
|
|||
<paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
|
||||
<paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="4" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="P21" fontName="Times-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P22" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P23" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
|
||||
<paraStyle name="Standard" fontName="Times-Roman"/>
|
||||
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
|
||||
<paraStyle name="Table Contents" fontName="Times-Roman" alignment="CENTER" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
|
||||
<paraStyle name="Table Contents1" fontName="Times-Roman" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
|
||||
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Index" fontName="Times-Roman"/>
|
||||
|
|
@ -130,19 +133,20 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P17">
|
||||
<font face="Times-Roman">Document:</font>
|
||||
<font face="Times-Roman">[[o.name]]</font>
|
||||
<font face="Times-Roman">Document:</font><font face="Times-Roman">[[ o.name ]]</font>
|
||||
</para>
|
||||
<para style="P17">
|
||||
<font face="Times-Roman">Invoice Date: </font>
|
||||
<font face="Times-Roman">[[o.date_invoice]]</font>
|
||||
<font face="Times-Roman">Invoice Date: </font><font face="Times-Roman">[[ formatLang(o.date_invoice,date=True) ]]</font>
|
||||
</para>
|
||||
<para style="P18">
|
||||
<font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="206.0,62.0,62.0,62.0,61.0,74.0" style="Tableau6">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">Description</para>
|
||||
|
|
@ -166,19 +170,22 @@
|
|||
</blockTable>
|
||||
<section>
|
||||
<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
|
||||
<blockTable colWidths="0.0,216.0,62,38,29,67,53,53" style="Tableau7">
|
||||
<blockTable colWidths="0.0,216.0,60.0,31.0,16.0,31.0,31.0,61.0,45.0,23.0" style="Tableau7">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['name'] ]]</para>
|
||||
<para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['name'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['tax_types'] ]]</para>
|
||||
<para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['tax_types'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]][[ a['uos'] ]]</para>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['uos'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para><font color="white"></font></para>
|
||||
|
|
@ -187,10 +194,13 @@
|
|||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_unit'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['discount'] ]]</para>
|
||||
<para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['discount'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_subtotal'] ]][[ a['currency'] ]]</para>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_subtotal'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['currency'] ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -239,10 +249,10 @@
|
|||
</blockTable>
|
||||
</section>
|
||||
|
||||
<blockTable colWidths="215.0,313.0" style="Tableau3">
|
||||
<blockTable colWidths="216.0,325.0" style="Tableau3">
|
||||
<tr>
|
||||
<td>
|
||||
<blockTable colWidths="81.0,73.0,60.0" style="Tableau4">
|
||||
<blockTable colWidths="81.0,73.0,65.0" style="Tableau4">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P10">Tax</para>
|
||||
|
|
@ -256,8 +266,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P5">
|
||||
<font face="Times-Roman">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
|
||||
<para style="P11a"><font face="Times-Roman" size="2.0">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P11">[[ '%.2f' % t.base ]]</para>
|
||||
|
|
@ -272,7 +281,7 @@
|
|||
<blockTable colWidths="214.0,95.0" style="Tableau5">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P7">Total (excl. taxes):</para>
|
||||
<para style="P13">Total (excl. taxes):</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P12">[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</para>
|
||||
|
|
@ -280,7 +289,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P7">Taxes:</para>
|
||||
<para style="P13">Taxes:</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P12">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para>
|
||||
|
|
@ -303,5 +312,4 @@
|
|||
<para style="P19">[[ format(o.comment) or '' ]]</para>
|
||||
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or '' ]]</para>
|
||||
</story>
|
||||
</document>
|
||||
|
||||
</document>
|
||||
|
|
@ -90,7 +90,7 @@ class account_invoice_with_message(report_sxw.rml_parse):
|
|||
if entry.uos_id.id==False:
|
||||
res['uos']=''
|
||||
else:
|
||||
uos_name = self.pool.get('product.uom').read(self.cr,self.uid,entry.uos_id.id,['name'])
|
||||
uos_name = self.pool.get('product.uom').read(self.cr,self.uid,entry.uos_id.id,['name'],self.context.copy())
|
||||
res['uos']=uos_name['name']
|
||||
else:
|
||||
|
||||
|
|
@ -132,13 +132,13 @@ class account_invoice_with_message(report_sxw.rml_parse):
|
|||
res['price_subtotal']=''
|
||||
res['currency']=''
|
||||
elif entry.state=='line':
|
||||
res['quantity']='____________'
|
||||
res['price_unit']='______________'
|
||||
res['discount']='____________'
|
||||
res['tax_types']='_________________'
|
||||
res['quantity']='___________________'
|
||||
res['price_unit']='______________________'
|
||||
res['discount']='____________________________________'
|
||||
res['tax_types']='_____________________'
|
||||
res['uos']='_____'
|
||||
res['name']='_____________________________________________'
|
||||
res['price_subtotal']='_____________________'
|
||||
res['name']='______________________________________'
|
||||
res['price_subtotal']='___________'
|
||||
res['currency']='_'
|
||||
elif entry.state=='break':
|
||||
res['type']=entry.state
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<blockTableStyle id="Tableau6">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<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"/>
|
||||
|
|
@ -72,6 +71,8 @@
|
|||
<paraStyle name="P16" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
|
||||
<paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P11a" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P8a" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
|
||||
<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
|
||||
<paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
|
||||
<paraStyle name="P21" fontName="Times-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
|
|
@ -81,6 +82,7 @@
|
|||
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
|
||||
<paraStyle name="Table Contents1" fontName="Times-Roman" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
|
||||
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Index" fontName="Times-Roman"/>
|
||||
|
|
@ -130,19 +132,17 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P17">
|
||||
<font face="Times-Roman">Document:</font>
|
||||
<font face="Times-Roman">[[o.name]]</font>
|
||||
<font face="Times-Roman">Document:</font><font face="Times-Roman">[[o.name]]</font>
|
||||
</para>
|
||||
<para style="P17">
|
||||
<font face="Times-Roman">Invoice Date: </font>
|
||||
<font face="Times-Roman">[[o.date_invoice]]</font>
|
||||
<font face="Times-Roman">Invoice Date: </font><font face="Times-Roman">[[ formatLang(o.date_invoice,date=True) ]]</font>
|
||||
</para>
|
||||
<para style="P18">
|
||||
<font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
|
||||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
|
||||
<blockTable colWidths="216.0,62.0,62.0,62.0,61.0,64.0" style="Tableau6">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">Description</para>
|
||||
|
|
@ -166,19 +166,22 @@
|
|||
</blockTable>
|
||||
<section>
|
||||
<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
|
||||
<blockTable colWidths="0.0,216.0,62,38,29,67,53,53" style="Tableau7">
|
||||
<blockTable colWidths="0.0,216.0,61.0,30.0,16.0,31.0,31.0,61.0,39.0,25.0" style="Tableau7">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['name'] ]]</para>
|
||||
<para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['name'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['tax_types'] ]]</para>
|
||||
<para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['tax_types'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]][[ a['uos'] ]]</para>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['quantity'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['uos'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para><font color="white"></font></para>
|
||||
|
|
@ -187,10 +190,13 @@
|
|||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_unit'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['discount'] ]]</para>
|
||||
<para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['discount'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_subtotal'] ]][[ a['currency'] ]]</para>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['price_subtotal'] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['currency'] ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -256,8 +262,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P5">
|
||||
<font face="Times-Roman">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
|
||||
<para style="P11a"><font face="Times-Roman" size="2.0">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P11">[[ '%.2f' % t.base ]]</para>
|
||||
|
|
@ -308,4 +313,3 @@
|
|||
</section>
|
||||
</story>
|
||||
</document>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue