From a33476c2136bad75f0e9b717d4ec226715ec0751 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Wed, 8 Sep 2004 13:34:08 +0000 Subject: [PATCH] Renamed from invoice_transaction_print.pt to SaleInvoiceTransaction_viewAsPDF.pt. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1685 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...pt => SaleInvoiceTransaction_viewAsPDF.pt} | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) rename product/ERP5/skins/erp5_trade/{invoice_transaction_print.pt => SaleInvoiceTransaction_viewAsPDF.pt} (65%) diff --git a/product/ERP5/skins/erp5_trade/invoice_transaction_print.pt b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsPDF.pt similarity index 65% rename from product/ERP5/skins/erp5_trade/invoice_transaction_print.pt rename to product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsPDF.pt index 066eda75f1..dc8c8f877e 100755 --- a/product/ERP5/skins/erp5_trade/invoice_transaction_print.pt +++ b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsPDF.pt @@ -23,15 +23,15 @@ </tr> <tr> <td align=left tal:content="python: from_organisation.getCorporateName()" colspan="2" /> - <td align=right tal:content="python: 'Invoice Date: %s' % here.getStartDate()"/> + <td align=right tal:content="python: 'Invoice / Date Facture: %s' % here.getStartDate().ISO()"/> </tr> <tr> <td align=left tal:content="python: 'Tel: %s' % from_organisation.getDefaultTelephone().asText()" colspan="2"/> - <td align=right tal:content="python: 'Pay Before: %s' % here.Invoice_zGetDueDate()"/> + <td align=right tal:content="python: 'Pay Before / Payer avant: %s' % here.SaleInvoiceTransaction_getDueDate().ISO()"/> </tr> <tr> <td tal:content="python: from_organisation.getDefaultAddress().getStreetAddress()" colspan="2"/> - <td align=right tal:content="python: 'Invoice No: ERP5/%s' % here.getId()"/> + <td align=right tal:content="python: 'Invoice / Facture No: ERP5/%s' % here.getId()"/> </tr> <tr> <td tal:content="python: '%s %s' % @@ -44,7 +44,7 @@ <tr> <th colspan=3> - <h2>INVOICE</h2> + <h2>INVOICE / FACTURE</h2> </th> </tr> @@ -54,8 +54,8 @@ <table width=100%> <tr bgcolor=000000> - <th align=left><font color=ffffff>INVOICE ADDRESS</font></th> - <th align=left><font color=ffffff>DELIVERY ADDRESS</font></th> + <th align=left><font color=ffffff size=-2>INVOICE ADDRESS / ADRESSE FACTURATION</font></th> + <th align=left><font color=ffffff size=-2>DELIVERY ADDRESS / ADRESSE LIVRAISON </font></th> </tr> <tr> @@ -86,12 +86,12 @@ <table width=100%> <tr bgcolor=000000> - <th align=left nowrap><font color=ffffff>Number</font></th> - <th align=left nowrap><font color=ffffff>Description</font></th> - <th nowrap><font color=ffffff>Quantity</th> - <th nowrap><font color=ffffff>Unit</font></th> - <th nowrap><font color=ffffff>Unit Price</font></th> - <th nowrap><font color=ffffff>Total Price</font></th> + <th align=left nowrap><font color=ffffff size=-2>Nbr / No</font></th> + <th align=left nowrap><font color=ffffff size=-2>Description</font></th> + <th nowrap><font color=ffffff size=-2>Qty / Qt锟�</th> + <th nowrap><font color=ffffff size=-2>Unit</font></th> + <th nowrap><font color=ffffff size=-2>Price / Prix Unit.</font></th> + <th nowrap><font color=ffffff size=-2>Price / Prix Total</font></th> </tr> <tal:block tal:condition="python: packing_list is not None"> <span tal:define="ordered_line_list python:packing_list.contentValues(filter={'portal_type':'Delivery Line'})" @@ -100,9 +100,10 @@ <td align=left tal:content="python:line.getId()"></td> <!-- <td> </td> --> - <td tal:content="python: line.getResourceTitle()"></td> + <td tal:content="python: line.getResourceTitle()" tal:condition="python: line.getDescription() == ''"></td> + <td tal:content="python: line.getDescription()" tal:condition="python: line.getDescription() != ''"></td> <td align=right tal:content="python: '%.0f' % line.getQuantity()"></td> - <td>n/a</td> + <td align=right tal:content="python: line.getQuantityUnitTitle() or line.getQuantityUnit()">n/a</td> <td align=right tal:content="python: '%.02f' % line.getPrice()"></td> <td align=right tal:content="python: '%.02f' % line.getTotalPrice()"></td> </tr> @@ -114,9 +115,10 @@ <td align=left tal:content="python:line.getId()"></td> <!-- <td> </td> --> - <td tal:content="python: line.getResourceTitle()"></td> + <td tal:content="python: line.getResourceTitle()" tal:condition="python: line.getDescription() == ''"></td> + <td tal:content="python: line.getDescription()" tal:condition="python: line.getDescription() != ''"></td> <td align=right tal:content="python: '%.0f' % line.getQuantity()"></td> - <td align=right tal:content="python: line.getQuantityUnitTitle()">n/a</td> + <td align=right tal:content="python: line.getQuantityUnitTitle() or line.getQuantityUnit()">n/a</td> <td align=right tal:content="python: '%.02f' % line.getPrice()"></td> <td align=right tal:content="python: '%.02f' % line.getTotalPrice()"></td> </tr> @@ -126,28 +128,28 @@ <td colspan=6><hr noshade></td> </tr> <tr> - <th colspan=4 align=right>Total + <th colspan=5 align=right>Total (<span tal:replace="here/income/getResourceId | nothing"/>)</th> - <td colspan=2 align=right tal:content="python: '%.02f' % round(here.getTotalPrice(), 2)" tal:on-error="nothing"></td> + <td colspan=1 align=right tal:content="python: '%.02f' % round(here.getTotalPrice(), 2)" tal:on-error="nothing"></td> </tr> <tr> - <td colspan=1 align=left tal:content="python:here.getDescription()"></td> - <th colspan=3 align=right>VAT <tal:block tal:replace="python: (here.getValueAddedTaxRatio() or 0.0) * 100.0"/> % (<span tal:replace="here/income/getResourceId | nothing"/>)</th> - <td colspan=2 align=right tal:content="python: '%.02f' % round(here.Invoice_zGetTotalVat(), 2)" tal:on-error="nothing"></td> + <td colspan=2 align=left tal:content="python:here.getDescription()"></td> + <th colspan=3 align=right>TVA / VAT<br> <tal:block tal:replace="python: (here.getValueAddedTaxRatio() or 0.0) * 100.0"/> % (<span tal:replace="here/income/getResourceId | nothing"/>)</th> + <td colspan=1 align=right tal:content="python: '%.02f' % round(here.Invoice_zGetTotalVat(), 2)" tal:on-error="nothing"></td> </tr> <tr> <td colspan=3> </td> <td colspan=3><hr noshade></td> </tr> <tr> - <td colspan=3>A r茅gler dans <b tal:content="python: here.getPaymentTerm(30)">0</b> jours au plus tard. - <br><font size="-3">Conditions de r茅glement: par ch猫ue, 脿 0 jours date de la facture. Paiement accept茅 en euros. - Tout retard de r茅glement donnera lieu 脿 une p茅nalit茅 de 1,5% du montant d没 par mois. - R茅serve de propri茅t茅 nous conservons la pleine propri茅t茅 des marchandises jusqu'au paiement int茅gral du prix, des taxes et accessoires.</font></td> + <td colspan=3>A r锟絞ler dans <b tal:content="python: here.getPaymentTerm(30)">0</b> jours au plus tard. + <br><font size="-3">Conditions de r锟絞lement: par ch锟絨ue ou virement, 锟� <b tal:replace="python: here.getPaymentTerm(30)">0</b> jours date de la facture. Paiement accept锟� en euros. + Tout retard de r锟絞lement donnera lieu 锟� une p锟絥alit锟� de 1,5% du montant d锟� par mois. + R锟絪erve de propri锟絫锟� nous conservons la pleine propri锟絫锟� des marchandises jusqu'au paiement int锟絞ral du prix, des taxes et accessoires.</font></td> - <th colspan=1 align=right nowrap>Amount Paid + <th colspan=2 align=right nowrap>Montant Total<br>Total Amount (<span tal:replace="here/income/getResourceId | nothing"/>)</th> - <th colspan=2 align=right tal:content="python: '%.02f' % (round(here.Invoice_zGetTotalVat(), 2) + round(here.Invoice_zGetTotalNetPrice(), 2))" tal:on-error="nothing"></th> + <th colspan=1 align=right tal:content="python: '%.02f' % (round(here.Invoice_zGetTotalVat(), 2) + round(here.Invoice_zGetTotalNetPrice(), 2))" tal:on-error="nothing"></th> </tr> <tr> <td> </td> @@ -157,13 +159,13 @@ <table width="100%"> <tr> <td><center><h6>RCS Roubaix Tourcoing 440 047 504<br> - Banque: 30027 Guichet: 00039 Compte: 00000013323 RIB: 36<br>IBAN: FR76 3002 7175 3900 0410 2760 135<br> + Banque: 30027 Guichet: 17503 Compte: 00065894401 RIB: 62<br>IBAN: FR76 3002 7175 0300 0658 9440 162<br> + VAT FR72440047504</h6></center></td> </tr> </table> - </body> </html> -- 2.30.9