summaryrefslogtreecommitdiff
path: root/templates/spiff-en/invoice.html.diff
blob: 82686b652ec214f294455dfd98e325e47a546ba8 (plain) 
    

  1. --- invoice.html.orig   2002-06-04 19:19:43.000000000 +0200
    2. 

  2. +++ invoice.html    2002-07-09 13:23:45.000000000 +0200
    3. 

  3. @@ -1,56 +1,58 @@
    4. 

  4.  <body bgcolor="white">
    5. 

  5. -
    6. 

  6.  <table width="100%">
    7. 

  7.  <tr valign="bottom">
    8. 

  8.    <td width="10">&nbsp;</td>
    9. 

  9.    <td>
    10. 

  10. +<table width="100%" cellspacing="0" cellpadding="0">
    11. 

  11.    
    12. 

  12. +<tr>
    13. 

  13. +<td>
    14. 

  14.    <table width="100%">
    15. 

  15.    <tr>
    16. 

  16. + <%if shiptoname%>
    17. 

  17. +<td colspan="2">
    18. 

  18. + <%end shiptoname%>
    19. 

  19. + <%if not shiptoname%>
    20. 

  20.      <td>
    21. 

  21. -      <h4>
    22. 

  22. -      <%company%>
    23. 

  23. -      <br><%address%>
    24. 

  24. -      </h4>
    25. 

  25. -    </td>
    26. 

  26. -
    27. 

  27. -    <td align="right">
    28. 

  28. -      <h4>
    29. 

  29. -      Tel: <%tel%>
    30. 

  30. -      <br>Fax: <%fax%>
    31. 

  31. -      </h4>
    32. 

  32. + <%end shiptoname%>
    33. 

  33.      </td>
    34. 

  34. +<td align="right" rowspan="3">
    35. 

  35. +<table>
    36. 

  36. +<tr valign="bottom">
    37. 

  37. +<th align="left" colspan="3">
    38. 

  38. +<h2>INVOICE</h2>
    39. 

  39. +</th>
    40. 

  40.    </tr>
    41. 

  41.  
    42. 

  42.    <tr>
    43. 

  43. -    <th colspan="3">
    44. 

  44. -      <h4>I N V O I C E</h4>
    45. 

  45. -    </th>
    46. 

  46. +<th align="right">Invoice Number:</th>
    47. 

  47. +<td>&nbsp;</td>
    48. 

  48. +<td><%invnumber%></td>
    49. 

  49.    </tr>
    50. 

  50.  
    51. 

  51. -  </table>
    52. 

  52. -
    53. 

  53. -
    54. 

  54. -  <table width="100%" cellspacing="0" cellpadding="0">
    55. 

  55. -    
    56. 

  56. -  <tr>
    57. 

  57. -    <td align="right">
    58. 

  58. -    <table>
    59. 

  59. +<%if businessnumber%>
    60. 

  60.      <tr>
    61. 

  61. -      <th align="right">Invoice Date</th><td width="10">&nbsp;</td><td><%invdate%></td>
    62. 

  62. +<th align="right">Business Numberr:</th>
    63. 

  63. +<td>&nbsp;</td>
    64. 

  64. +<td><%businessnumber%></td>
    65. 

  65.      </tr>
    66. 

  66. +<%end businessnumber%>
    67. 

  67.    
    68. 

  68.      <tr>
    69. 

  69. -      <th align="right">Due Date</th><td width="10">&nbsp;</td><td><%duedate%></td>
    70. 

  70. +<th align="right">Invoice Date:</th>
    71. 

  71. +<td width="10">&nbsp;</td>
    72. 

  72. +<td><%invdate%></td>
    73. 

  73.      </tr>
    74. 

  74.  
    75. 

  75.      <tr>
    76. 

  76. -      <th align="right">Number</th><td>&nbsp;</td><td><%invnumber%></td>
    77. 

  77. +<th align="right">Due Date:</th>
    78. 

  78. +<td width="10">&nbsp;</td>
    79. 

  79. +<td><%duedate%></td>
    80. 

  80.      </tr>
    81. 

  81.    
    82. 

  82.  <!--
    83. 

  83.      <tr>
    84. 

  84. -      <th align="right">Clerk:</th><td>&nbsp;</td><td><%username%></td>
    85. 

  85. +<th align="left">Clerk:</th><td>&nbsp;</td><td><%username%></td>
    86. 

  86.      </tr>
    87. 

  87.  -->
    88. 

  88.  
    89. 

  89. @@ -61,33 +63,30 @@
    90. 

  90.      </td>
    91. 

  91.    </tr>
    92. 

  92.  
    93. 

  93. -  <tr>
    94. 

  94. -    <td>
    95. 

  95. -    <table width="100%">
    96. 

  96. -    <tr bgcolor="black">
    97. 

  97. -      <th align="left"><font color="white">Bill To:</font></th>
    98. 

  98. -      <th align="left"><font color="white">Ship To:</font></th>
    99. 

  99. +<tr valign="bottom">
    100. 

  100. +<th align="left">Bill To:</th>
    101. 

  101. + <%if shiptoname%>
    102. 

  102. +<th align="left">Ship To:</th>
    103. 

  103. + <%end shiptoname%>
    104. 

  104.      </tr>
    105. 

  105.  
    106. 

  106.  <!--
    107. 

  107. -     other variables which can be use:
    108. 

  108. -     contact, shiptocontact, shiptophone, shiptofax
    109. 

  109. +other possible variables: contact, shiptocontact, shiptophone, shiptofax
    110. 

  110.  -->
    111. 

  111.  
    112. 

  112. -    <tr>
    113. 

  113. -      <td><%name%>
    114. 

  114. -      <br><%addr1%>
    115. 

  115. -      <br><%addr2%>
    116. 

  116. -      <br><%addr3%>
    117. 

  117. -      <br><%addr4%>
    118. 

  118. -      </td>
    119. 

  119. -      
    120. 

  120. -      <td><%shiptoname%>
    121. 

  121. -      <br><%shiptoaddr1%>
    122. 

  122. -      <br><%shiptoaddr2%>
    123. 

  123. -      <br><%shiptoaddr3%>
    124. 

  124. -      <br><%shiptoaddr4%>
    125. 

  125. -      </td>
    126. 

  126. +<tr valign="top">
    127. 

  127. +<td><b><%name%></b><br>
    128. 

  128. +<%addr1%><br>
    129. 

  129. +<%addr2%><br>
    130. 

  130. +<%addr3%><br>
    131. 

  131. +<%addr4%></td>
    132. 

  132. + <%if shiptoname%>
    133. 

  133. +<td><b><%shiptoname%></b><br>
    134. 

  134. +<%shiptoaddr1%><br>
    135. 

  135. +<%shiptoaddr2%><br>
    136. 

  136. +<%shiptoaddr3%><br>
    137. 

  137. +<%shiptoaddr4%></td>
    138. 

  138. + <%end shiptoname%>
    139. 

  139.      </tr>
    140. 

  140.      </table>
    141. 

  141.      </td>
    142. 

  142. @@ -100,20 +99,20 @@
    143. 

  143.    <tr>
    144. 

  144.      <td>
    145. 

  145.      <table width="100%">
    146. 

  146. -    <tr bgcolor="black">
    147. 

  147. -<!--      <th align="right"><font color="white">No.</font></th>  -->
    148. 

  148. -      <th align="left"><font color="white">Number</font></th>
    149. 

  149. -      <th align="left"><font color="white">Description</font></th>
    150. 

  150. -      <th><font color="white">Qt'y</font></th>
    151. 

  151. -      <th>&nbsp;</th>
    152. 

  152. -      <th><font color="white">Price</font></th>
    153. 

  153. -      <th><font color="white">Disc</font></th>
    154. 

  154. -      <th><font color="white">Amount</font></th>
    155. 

  155. +<tr>
    156. 

  156. +<!-- <th align=right>No.</th> -->
    157. 

  157. +<th align="left">Number</th>
    158. 

  158. +<th align="left">Description</th>
    159. 

  159. +<th colspan="2">Q'ty</th>
    160. 

  160. +<th>Price</th>
    161. 

  161. +<th>Disc</th>
    162. 

  162. +<th>Amount</th>
    163. 

  163.      </tr>
    164. 

  164.  
    165. 

  165.  <%foreach number%>
    166. 

  166.      <tr valign="top">
    167. 

  167. -<!--      <td align="right"><%runningnumber%>.</td>
    168. 

  168. +<!--
    169. 

  169. +<td align=right><%runningnumber%>.</td>
    170. 

  170.  adjust the colspan if you include this to shift subtotal one to the right
    171. 

  171.  -->
    172. 

  172.        <td><%number%></td>
    173. 

  173. @@ -131,51 +130,59 @@
    174. 

  174.  don't want to show the discount
    175. 

  175.  netprice = sellprice - discount
    176. 

  176.  -->
    177. 

  177. -
    178. 

  178.      <tr>
    179. 

  179. -      <td colspan="7"><hr noshade></td>
    180. 

  180. +<td colspan="7">
    181. 

  181. +<hr noshade>
    182. 

  182. +</td>
    183. 

  183.      </tr>
    184. 

  184.      
    185. 

  185.      <tr>
    186. 

  186.  <%if taxincluded%>
    187. 

  187. -      <th colspan="5" align="right">Total</th>
    188. 

  188. +<th colspan="5" align="right">Total:</th>
    189. 

  189.        <td colspan="2" align="right"><%invtotal%></td>
    190. 

  190.  <%end taxincluded%>
    191. 

  191.  <%if not taxincluded%>
    192. 

  192. -      <th colspan="5" align="right">Subtotal</th>
    193. 

  193. +<th colspan="5" align="right">Subtotal:</th>
    194. 

  194.        <td colspan="2" align="right"><%subtotal%></td>
    195. 

  195. -<%end taxincluded%>
    196. 

  196. -    </tr>
    197. 

  197. +<%end taxincluded%></tr>
    198. 

  198.  
    199. 

  199.  <%foreach tax%>
    200. 

  200.      <tr>
    201. 

  201. -      <th colspan="5" align="right"><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
    202. 

  202. +<th colspan="5" align="right"><%taxdescription%> (<%taxrate%>%) of
    203. 

  203. +<%taxbase%>:</th>
    204. 

  204.        <td colspan="2" align="right"><%tax%></td>
    205. 

  205.      </tr>
    206. 

  206.  <%end tax%>
    207. 

  207. -
    208. 

  208.  <%if paid%>
    209. 

  209.      <tr>
    210. 

  210. -      <th colspan="5" align="right">Paid</th>
    211. 

  211. +<th colspan="5" align="right">Paid:</th>
    212. 

  212.        <td colspan="2" align="right">- <%paid%></td>
    213. 

  213.      </tr>
    214. 

  214.  <%end paid%>
    215. 

  215.  
    216. 

  216.      <tr>
    217. 

  217. -      <td colspan="3">&nbsp;</td>
    218. 

  218. -      <td colspan="4"><hr noshade></td>
    219. 

  219. +<td colspan="5">&nbsp;</td>
    220. 

  220. +<td colspan="2">
    221. 

  221. +<hr noshade>
    222. 

  222. +</td>
    223. 

  223.      </tr>
    224. 

  224.  
    225. 

  225.      <tr>
    226. 

  226.        <td colspan="3">Terms Net <b><%terms%></b> days</td>
    227. 

  227. -      <th colspan="2" align="right">Outstanding</th>
    228. 

  228. +<th colspan="2" align="right">Outstanding:</th>
    229. 

  229.        <th colspan="2" align="right"><%total%></th>
    230. 

  230.      </tr>
    231. 

  231.  
    232. 

  232.      <tr>
    233. 

  233. -      <td>&nbsp;</td>
    234. 

  234. +<td colspan="5">&nbsp;</td>
    235. 

  235. +<td colspan="2">
    236. 

  236. +<hr noshade>
    237. 

  237. +</td>
    238. 

  238.      </tr>
    239. 

  239.  
    240. 

  240. +<tr>
    241. 

  241. +<td>&nbsp;</td>
    242. 

  242. +</tr>
    243. 

  243.      </table>
    244. 

  244.      </td>
    245. 

  245.    </tr>
    246. 

  246. @@ -185,84 +192,91 @@
    247. 

  247.    <table width="100%">
    248. 

  248.      <tr valign="top">
    249. 

  249.  <%if notes%>
    250. 

  250. -      <td>Notes</td>
    251. 

  251. +<td>Notes:</td>
    252. 

  252.        <td><%notes%></td>
    253. 

  253.  <%end notes%>
    254. 

  254. -      <td align="right">
    255. 

  255. -      All prices in <b><%currency%></b> Funds
    256. 

  256. -      <br><%shippingpoint%>
    257. 

  257. +<td>
    258. 

  258. +<table width="100%">
    259. 

  259. + <%if taxincluded%>
    260. 

  260. +<tr valign="top">
    261. 

  261. +<td align="right">Taxes shown are <strong>included</strong> in price.</td>
    262. 

  262. +</tr>
    263. 

  263. + <%end taxincluded%>
    264. 

  264. +<!-- tax codes
    265. 

  265. + <%foreach tax%>
    266. 

  266. +<tr valign="top">
    267. 

  267. +<td align="right"><%taxdescription%> Registration <%taxnumber%></td>
    268. 

  268. +</tr>
    269. 

  269. + <%end tax%>
    270. 

  270. +-->
    271. 

  271. +<tr valign="top">
    272. 

  272.        </td>
    273. 

  273. +<td align="right">All prices in <strong><%currency%></strong> Funds<br>
    274. 

  274. +<%shippingpoint%></td>
    275. 

  275. +</tr>
    276. 

  276. +</table>
    277. 

  277.      </tr>
    278. 

  278. -
    279. 

  279.    </table>
    280. 

  280.    </td>
    281. 

  281.  </tr>
    282. 

  282.  
    283. 

  283. -<tr><td>&nbsp;</td></tr>
    284. 

  284. +<tr>
    285. 

  285. +<td>&nbsp;</td>
    286. 

  286. +</tr>
    287. 

  287.    
    288. 

  288.  <tr>
    289. 

  289. -  <th colspan="7">
    290. 

  290. -  <br>Thank you for your valued business!
    291. 

  291. -  </th>
    292. 

  292. +<td>
    293. 

  293. +<p>
    294. 

  294. +<b>Thank you for your valued business!</b>
    295. 

  295. +<p>
    296. 

  296. +<%company%><br>
    297. 

  297. +<%address%><br>
    298. 

  298. +<%if tel%>
    299. 

  299. +Tel: <%tel%><br>
    300. 

  300. +<%end tel%>
    301. 

  301. + <%if fax%>
    302. 

  302. +Fax: <%fax%><br>
    303. 

  303. + <%end fax%>
    304. 

  304. +<p align="center">
    305. 

  305. +<strong>Payments within Denmark</strong><br>
    306. 

  306. +Please transfer directly to Merkur Andelskasse, bank account 8401-1028192<br>
    307. 

  307. +<strong>International payments</strong><br>
    308. 

  308. +Please transfer directly to Ringkjøbing Bank, Torvet 2, 6959 Ringkøbing<br>
    309. 

  309. +SWIFT code: RIBADK22, account: 076600784011<br>
    310. 

  310. +Add "To Spiff ApS (8401-1028192) from <%name%>" as text.
    311. 

  311. +</td>
    312. 

  312.  </tr>
    313. 

  313.  
    314. 

  314. -<tr><td>&nbsp;</td></tr>
    315. 

  315. +<tr>
    316. 

  316. +<td colspan="7">
    317. 

  317. +<hr noshade>
    318. 

  318. +</td>
    319. 

  319. +</tr>
    320. 

  320.  
    321. 

  321.  <tr>
    322. 

  322.    <td>
    323. 

  323.    <table width="100%">
    324. 

  324.    <tr valign="top">
    325. 

  325. -    <td><font size="-3">
    326. 

  326. -    Payment due NET <%terms%> Days from date of Invoice.
    327. 

  327. +<td><font size="-3">Payment due NET <%terms%> Days from date of Invoice.
    328. 

  328.      Interest on overdue amounts will acrue at the rate of 1.5% per month
    329. 

  329.      from due date until paid in full. Items returned are subject to
    330. 

  330.      a 10% restocking charge. A return authorization must be obtained
    331. 

  331.      from <%company%> before goods are returned. Returns must be shipped
    332. 

  332.      prepaid and properly insured. <%company%> will not be responsible
    333. 

  333. -    for damages during transit.
    334. 

  334. -    </font>
    335. 

  335. -    </td>
    336. 

  336. -    <td width="150">
    337. 

  337. +for damages during transit.</font></td>
    338. 

  338. +<!-- Signature
    339. 

  339. +<td width=150>
    340. 

  340.      X <hr noshade>
    341. 

  341.      </td>
    342. 

  342. +-->
    343. 

  343.    </tr>
    344. 

  344.    </table>
    345. 

  345.    </td>
    346. 

  346.  </tr>
    347. 

  347.  
    348. 

  348. -<%foreach tax%>
    349. 

  349. -  <tr>
    350. 

  350. -    <th colspan="7" align="left"><font size="-2"><%taxdescription%> Registration <%taxnumber%></font></th>
    351. 

  351. -  </tr>
    352. 

  352. -<%end tax%>
    353. 

  353. -
    354. 

  354. -<%if taxincluded%>
    355. 

  355. -  <tr>
    356. 

  356. -    <th colspan="7" align="left"><font size="-2">Taxes shown are included in price.</font></th>
    357. 

  357. -  </tr>
    358. 

  358. -<%end taxincluded%>
    359. 

  359. -
    360. 

  360. -<!-- business number
    361. 

  361. -  <tr>
    362. 

  362. -    <th colspan="7" align="left"><font size="-2">Business Number: <%businessnumber%></font></th>
    363. 

  363. -  </tr>
    364. 

  364. --->
    365. 

  365. -
    366. 

  366. -<!-- banking information
    367. 

  367. -  <tr>
    368. 

  368. -    <th colspan="7" align="left">Banking Information:
    369. 

  369. -    <br>Bank
    370. 

  370. -    <br>Transit No.
    371. 

  371. -    <br>Account No.
    372. 

  372. -    </td>
    373. 

  373. -  </tr>
    374. 

  374. --->
    375. 

  375. -
    376. 

  376.  </table>
    377. 

  377. -
    378. 

  378.  </td>
    379. 

  379.  </tr>
    380. 

  380.  </table>
    381. 

  381. -
    382. 

  382.  </body>
    383. 

  383.  </html>
    384.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 19:12:41 +0000