templates/jones/invoice.html.diff



--- invoice.html.orig   2005-08-14 13:53:10.000000000 +0200
+++ invoice.html    2006-03-22 23:51:59.000000000 +0100
@@ -1,282 +1,285 @@
+<body bgcolor="white">
+<table width="100%">
+<tr valign="bottom">
+<td width="10">&nbsp;</td>
+<td>
+<table width="100%" cellspacing="0" cellpadding="0">
 
-<body bgcolor=ffffff>
+<tr>
+<td>
+<table width="100%">
+<tr>
+ <?lsmb if shiptoname ?>
+<td colspan="2">
+ <?lsmb end shiptoname ?>
+ <?lsmb if not shiptoname ?>
+<td>
+ <?lsmb end shiptoname ?>
+</td>
+<td align="right" rowspan="3">
+<table>
+<tr valign="bottom">
+<th align="left" colspan="3">
+<h2>FAKTURA</h2>
+</th>
+</tr>
+
+<tr>
+<th align="right">Fakturanummer:</th>
+<td>&nbsp;</td>
+<td><?lsmb invnumber ?></td>
+</tr>
+
+<?lsmb if businessnumber ?>
+<tr>
+<th align="right">CVR-nummer:</th>
+<td>&nbsp;</td>
+<td><?lsmb businessnumber ?></td>
+</tr>
+<?lsmb end businessnumber ?>
+
+<tr>
+<th align="right">Fakturadato:</th>
+<td width="10">&nbsp;</td>
+<td><?lsmb invdate ?></td>
+</tr>
+
+<tr>
+<th align="right">Forfaldsdato:</th>
+<td width="10">&nbsp;</td>
+<td><?lsmb duedate ?></td>
+</tr>
 
-<table width="100%">
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width="100%">
-  <tr>
-    <td>
-      <h4>
-      <?lsmb company ?>
-      <br><?lsmb address ?>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tlf.: <?lsmb tel ?>
-      <br>Fax: <?lsmb fax ?>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>F A K T U R A</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width="100%" callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Fakturadato</th><td width=10>&nbsp;</td><td><?lsmb invdate ?></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Betalingsdato</th><td width=10>&nbsp;</td><td><?lsmb duedate ?></td>
-    </tr>
-
-    <tr>
-      <th align=right>Fakturanummer</th><td>&nbsp;</td><td><?lsmb invnumber ?></td></tr>
-    </tr>
-  
 <!--
-    <tr>
-      <th align=right>Ekspederet af:</th><td>&nbsp;</td><td><?lsmb username ?></td>
-    </tr>
+<tr>
+<th align="left">Ekspedient:</th><td>&nbsp;</td><td><?lsmb username ?></td>
+</tr>
 -->
 
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Faktureringsadresse:</th>
-     <?lsmb if shiptoname ?>
-      <th align=left><font color=ffffff>Leveringsadresse:</th>
-     <?lsmb end shiptoname ?>
-    </tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr valign="bottom">
+<th align="left">Faktureringsadresse:</th>
+ <?lsmb if shiptoname ?>
+<th align="left">Leveringsadresse:</th>
+ <?lsmb end shiptoname ?>
+</tr>
 
 <!--
-     other variables which can be use:
-     contact, shiptocontact, shiptophone, shiptofax
+andre mulige variable: state, contact, customerphone, customerfax, email, shiptostate, shiptocontact, shiptophone, shiptofax, shiptoemail
 -->
 
-    <tr>
-      <td><?lsmb name ?>
-      <br><?lsmb address1 ?>
-      <?lsmb if address2 ?>
-<br><?lsmb address2 ?>
-<?lsmb end address2 ?>
-      <br><?lsmb city ?> <?lsmb state ?> <?lsmb zipcode ?>
-      <?lsmb if country ?>
-<?lsmb country ?>
-<?lsmb end country ?>
-      </td>
-      
-     <?lsmb if shiptoname ?>
-      <td><?lsmb shiptoname ?>
-      <br><?lsmb shiptoaddress1 ?>
-      <?lsmb if shiptoaddress2 ?>
-<br><?lsmb shiptoaddress2 ?>
-<?lsmb end shiptoaddress2 ?>
-      <br><?lsmb shiptocity ?> <?lsmb shiptostate ?> <?lsmb shiptozipcode ?>
-      <?lsmb if shiptocountry ?>
-<?lsmb shiptocountry ?>
-<?lsmb end shiptocountry ?>
-      </td>
-     <?lsmb end shiptoname ?>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Varenummer</th>
-      <th align=left><font color=ffffff>Beskrivelse</th>
-      <th><font color=ffffff>Antal</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Pris</th>
-      <th><font color=ffffff>Rabat</th>
-      <th><font color=ffffff>Bel�b</th>
-    </tr>
+<tr valign="top">
+<td><b><?lsmb name ?></b><br>
+<?lsmb address1 ?><br>
+ <?lsmb if address2 ?>
+<?lsmb address2 ?><br>
+ <?lsmb end address2 ?>
+<?lsmb zipcode ?> <?lsmb city ?><br>
+ <?lsmb if country ?>
+<?lsmb country ?></td>
+ <?lsmb end country ?>
+ <?lsmb if shiptoname ?>
+<td><b><?lsmb shiptoname ?></b><br>
+<?lsmb shiptoaddress1 ?><br>
+ <?lsmb if shiptoaddress2 ?>
+<?lsmb shiptoaddress2 ?><br>
+ <?lsmb end shiptoaddress2 ?>
+<?lsmb shiptozipcode ?> <?lsmb shiptocity ?><br>
+ <?lsmb if shiptocountry ?>
+<?lsmb shiptocountry ?></td>
+ <?lsmb end shiptocountry ?>
+ <?lsmb end shiptoname ?>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td>
+<table width="100%">
+<tr>
+<!-- <th align=right>L�benr.</th> -->
+<th align="left">Varenr.</th>
+<th align="left">Beskrivelse</th>
+<th colspan="2">Antal</th>
+<th>Pris</th>
+<th>Rabat</th>
+<th>Bel�b</th>
+</tr>
 
 <?lsmb foreach number ?>
-    <tr valign=top>
-<!--      <td align=right><?lsmb runningnumber ?>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
+<tr valign="top">
+<!--
+<td align=right><?lsmb runningnumber ?>.</td>
+Just�r "colspan" hvis du inkluderer l�benummeret, s� subtotal flyttes et felt til h�jre
 -->
-      <td><?lsmb number ?></td>
-      <td><?lsmb description ?></td>
-      <td align=right><?lsmb qty ?></td>
-      <td><?lsmb unit ?></td>
-      <td align=right><?lsmb sellprice ?></td>
-      <td align=right><?lsmb discount ?></td>
-      <td align=right><?lsmb linetotal ?></td>
-    </tr>
-<?lsmb end number ?>
+<td><?lsmb number ?></td>
+<td><?lsmb description ?></td>
+<td align="right"><?lsmb qty ?></td>
+<td><?lsmb unit ?></td>
+<td align="right"><?lsmb sellprice ?></td>
+<td align="right"><?lsmb discount ?></td>
+<td align="right"><?lsmb linetotal ?></td>
+</tr>
+ <?lsmb end number ?>
 
 <!--
-you can also use netprice instead of sellprice if you
-don't want to show the discount
-netprice = sellprice - discount
-to show the percentage for a discount use <?lsmb discountrate ?>
+Du kan ogs� bruge "netprice" istedet for "sellprice" hvis du ikke
+vil vise rabatten: netprice = sellprice - discount
 -->
+<tr>
+<td colspan="7">
+<hr noshade>
+</td>
+</tr>
 
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    <tr>
+<tr>
 <?lsmb if taxincluded ?>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><?lsmb invtotal ?></td>
+<th colspan="5" align="right">Total:</th>
+<td colspan="2" align="right"><?lsmb invtotal ?></td>
 <?lsmb end taxincluded ?>
 <?lsmb if not taxincluded ?>
-      <th colspan=5 align=right>Subtotal</th>
-      <td colspan=2 align=right><?lsmb subtotal ?></td>
-<?lsmb end taxincluded ?>
-    </tr>
+<th colspan="5" align="right">Subtotal:</th>
+<td colspan="2" align="right"><?lsmb subtotal ?></td>
+<?lsmb end taxincluded ?></tr>
 
 <?lsmb foreach tax ?>
-    <tr>
-      <th colspan=5 align=right><?lsmb taxdescription ?> p� <?lsmb taxbase ?> @ <?lsmb taxrate ?> %</th>
-      <td colspan=2 align=right><?lsmb tax ?></td>
-    </tr>
+<tr>
+<th colspan="5" align="right"><?lsmb taxdescription ?> (<?lsmb taxrate ?>%) af
+<?lsmb taxbase ?>:</th>
+<td colspan="2" align="right"><?lsmb tax ?></td>
+</tr>
 <?lsmb end tax ?>
-
 <?lsmb if paid ?>
-    <tr>
-      <th colspan=5 align=right>Allerede betalt</th>
-      <td colspan=2 align=right>- <?lsmb paid ?></td>
-    </tr>
+<tr>
+<th colspan="5" align="right">Allerede betalt:</th>
+<td colspan="2" align="right">- <?lsmb paid ?></td>
+</tr>
 <?lsmb end paid ?>
 
-    <tr>
-      <td colspan=3>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>Betalingsfrist <b><?lsmb terms ?></b> dage</td>
-      <th colspan=2 align=right>At betale</th>
-      <th colspan=2 align=right><?lsmb total ?></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width="100%">
-    <tr valign=top>
+<tr>
+<td colspan="5">&nbsp;</td>
+<td colspan="2">
+<hr noshade>
+</td>
+</tr>
+
+<tr>
+<td colspan="3">Betalingsfrist <b><?lsmb terms ?></b> dage</td>
+<th colspan="2" align="right">At betale:</th>
+<th colspan="2" align="right"><?lsmb total ?></th>
+</tr>
+
+<tr>
+<td colspan="5">&nbsp;</td>
+<td colspan="2">
+<hr noshade>
+</td>
+</tr>
+
+<tr>
+<td>&nbsp;</td>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr>
+<td>
+<table width="100%">
+<tr valign="top">
 <?lsmb if notes ?>
-      <td>Bem�rkninger</td>
-      <td><?lsmb notes ?></td>
+<td>Bem�rkninger:</td>
+<td><?lsmb notes ?></td>
 <?lsmb end notes ?>
-      <td align=right>
-      Alle priser i <b><?lsmb currency ?></b>.
-      <br><?lsmb shippingpoint ?>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <th colspan=7>
-  <br>Tak for handelen!
-  </th>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width="100%">
-  <tr valign=top>
-    <td><font size=-3>
-    Betalingsfrist <?lsmb terms ?> dage fra fakturadato. Betaling herefter p�regnes
-    1.5% per p�begyndt m�ned startende <?lsmb duedate ?> og indtil det fulde bel�b
-    er betalt. Returnerede varer modregnes 10% i ekspeditionsgebyr.
-    Et returnummer skal tildeles af <?lsmb company ?> f�r varer returneres.
-    Returvarer skal forsendes forudbetalt og forsvarligt forsikret.
-    <?lsmb company ?> kan ikke drages til ansvar for skade under transport.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
+<td>
+<table width="100%">
+ <?lsmb if taxincluded ?>
+<tr valign="top">
+<td align="right">Alle bel�b er <strong>inklusive moms</strong>.</td>
+</tr>
+ <?lsmb end taxincluded ?>
+<!-- afgifts- og momskoder
+ <?lsmb foreach tax ?>
+<tr valign="top">
+<td align="right"><?lsmb taxdescription ?> noteret som <?lsmb taxnumber ?></td>
+</tr>
+ <?lsmb end tax ?>
+-->
+<tr valign="top">
+</td>
+<td align="right">Alle priser i <strong><?lsmb currency ?></strong><br>
+<?lsmb shippingpoint ?></td>
+</tr>
+</table>
+</tr>
+</table>
+</td>
 </tr>
 
-<?lsmb foreach tax ?>
-  <tr>
-    <th colspan=7 align=left><font size=-2><?lsmb taxdescription ?> noteret som <?lsmb taxnumber ?></th>
-  </tr>
-<?lsmb end tax ?>
+<tr>
+<td>&nbsp;</td>
+</tr>
 
-<?lsmb if taxincluded ?>
-  <tr>
-    <th colspan=7 align=left><font size=-2>Alle bel�b er inklusive moms.</th>
-  </tr>
-<?lsmb end taxincluded ?>
+<tr>
+<td>
+<p>
+<b>Tak for handelen!</b>
+<p>
+<?lsmb company ?><br>
+<?lsmb address ?><br>
+<?lsmb if tel ?>
+Telefon: <?lsmb tel ?><br>
+<?lsmb end tel ?>
+ <?lsmb if fax ?>
+Fax: <?lsmb fax ?><br>
+ <?lsmb end fax ?>
+<p align="center">
+Indbetaling bedes ske til Merkur Andelskasse p� konto 8401-1036773<br>
+(Internationalt: SWIFT/BIC RIBADK22, IBAN: DK1784010001036773)
+</td>
+</tr>
 
-<!-- business number
-  <tr>
-    <th colspan=7 align=left><font size=-2>CVR-nummer: <?lsmb businessnumber ?></font></th>
-  </tr>
--->
+<tr>
+<td colspan="7">
+<hr noshade>
+</td>
+</tr>
 
-<!-- banking information
-  <tr>
-    <th colspan=7 align=left>Bank-oplysninger:
-    <br>Bank
-    <br>Banknummer
-    <br>Kontonummer
-    </td>
-  </tr>
+<tr>
+<td>
+<table width="100%">
+<tr valign="top">
+<td><font size="-3">Betalingsfrist <?lsmb terms ?> dage fra fakturadato.
+Betaling herefter p�regnes 1.5% per p�begyndt m�ned startende
+<?lsmb duedate ?> og indtil det fulde bel�b er betalt. Returnerede varer
+modregnes 10% i ekspeditionsgebyr. Et returnummer skal tildeles af
+<?lsmb company ?> f�r varer returneres. Returvarer skal forsendes
+forudbetalt og forsvarligt forsikret. <?lsmb company ?> kan ikke drages
+til ansvar for skade under transport.</font></td>
+<!-- Linje til underskrift
+<td width=150>
+X <hr noshade>
+</td>
 -->
-
+</tr>
 </table>
+</td>
+</tr>
 
+</table>
 </td>
 </tr>
 </table>
-
 </body>
 </html>
-