Commit 594db03a authored by Vincent Pelletier's avatar Vincent Pelletier

Differentiate proforma from invoice.

Don't show hours:minutes:seconds in date fields.
Get correctly the payment term date.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5077 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6ac1d57c
......@@ -58,18 +58,19 @@
\n
<html>\n
\n
\t<head>\n
\t\t<meta http-equiv="content-type" content="text/html;charset=UTF-8">\n
\t\t<title tal:content="here/getTitle">Nexedi</title>\n
<head>\n
<meta http-equiv="content-type" content="text/html;charset=UTF-8">\n
<title tal:content="here/getTitle">Nexedi</title>\n
\n
\t</head>\n
</head>\n
\n
\t<body bgcolor="#ffffff"\n
<body bgcolor="#ffffff"\n
tal:define="packing_list python:here.getDefaultValue(\'causality\',spec=[\'Sale Packing List\']);\n
invoice_line_list python:here.contentValues(filter={\'portal_type\':\'Invoice Line\'});\n
from_organisation python:here.getSourceSectionValue();\n
client_invoice python:here.getDefaultValue(\'destination_section\',spec=[\'Organisation\', \'Person\']);\n
client_delivery python:here.getDefaultValue(\'destination\',spec=[\'Organisation\', \'Person\']) or here.getDefaultValue(\'destination_section\',spec=[\'Organisation\', \'Person\']);\n
client_delivery python:here.getDefaultValue(\'destination\',spec=[\'Organisation\', \'Person\']);\n
client_delivery python:client_delivery or here.getDefaultValue(\'destination_section\',spec=[\'Organisation\', \'Person\']);\n
total_price python:here.getTotalPrice();\n
VAT_infos python:here.SaleInvoiceTransaction_getVAT()">\n
\n
......@@ -80,15 +81,15 @@
</tr>\n
<tr>\n
<td align=left tal:content="python: from_organisation.getCorporateName()" colspan="2" />\n
<td align=right tal:content="python: \'Invoice / Date Facture: %s\' % here.getStartDate().ISO()"/>\n
<td align=right tal:content="python: \'Invoice / Date Facture: %s\' % here.getStartDate().Date()"/>\n
</tr>\n
<tr>\n
<td align=left tal:content="python: \'Tel: %s\' % from_organisation.getDefaultTelephone().asText()" colspan="2"/>\n
<td align=right tal:content="python: \'Pay Before / Payer avant: %s\' % here.TradeCondition_getDueDate().ISO()"/>\n
<td align=right tal:content="python: \'Pay Before / Payer avant: %s\' % here.SaleInvoiceTransaction_getDueDate().Date()"/>\n
</tr>\n
<tr>\n
<td tal:content="python: from_organisation.getDefaultAddress().getStreetAddress()" colspan="2"/>\n
<td align=right> Invoice / Facture No: ERP5 <span tal:replace="python:here.getReference() or here.getId()"/> </td>\n
<td align=right> Invoice / Facture No: ERP5 <span tal:replace="python: here.getReference() or here.getId()"/> </td>\n
</tr>\n
<tr>\n
<td tal:content="python: \'%s %s\' %\n
......@@ -101,7 +102,8 @@
\n
<tr>\n
<th colspan=3>\n
<h2>INVOICE / FACTURE</h2>\n
<h2 tal:condition="python:here.getSimulationState() not in (\'draft\',\'planned\')">INVOICE / FACTURE</h2>\n
<h2 tal:condition="python:here.getSimulationState() in (\'draft\',\'planned\')">PROFORMA INVOICE / FACTURE PROFORMA</h2>\n
</th>\n
</tr>\n
\n
......@@ -199,7 +201,7 @@
<td colspan=3><hr noshade></td>\n
</tr>\n
<tr>\n
<td colspan=3>A r\xc3\xa9gler dans <b tal:content="python: here.getPaymentTerm(30)">0</b> jours au plus tard.\n
<td colspan=3>A r\xc3\xa9gler dans <b tal:content="python: here.getPaymentConditionPaymentTerm(30)">0</b> jours au plus tard.\n
<br><font size="-3">Conditions de r\xc3\xa9glement: par ch\xc3\xa9que ou virement, \xc3\xa0 <b tal:replace="python: here.getPaymentTerm(30)">0</b> jours date de la facture. Paiement accept\xc3\xa9 en euros.\n
Tout retard de r\xc3\xa9glement donnera lieu \xc3\xa0 une p\xc3\xa9nalit\xc3\xa9 de 1,5% du montant d\xc3\xa9 par mois.\n
R\xc3\xa9serve de propri\xc3\xa9t\xc3\xa9 nous conservons la pleine propri\xc3\xa9t\xc3\xa9 des marchandises jusqu\'au paiement int\xc3\xa9gral du prix, des taxes et accessoires.</font></td>\n
......@@ -217,7 +219,7 @@
<tr>\n
<td><center><h6>RCS Roubaix Tourcoing 440 047 504<br>\n
Banque:&nbsp;30027&nbsp;Guichet:&nbsp;17503&nbsp;Compte:&nbsp;00065894401&nbsp;RIB:&nbsp;62<br>IBAN: FR76 3002 7175 0300 0658 9440 162<br>\n
\t \n
\n
VAT FR72440047504</h6></center></td>\n
</tr>\n
</table>\n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment