summaryrefslogtreecommitdiff
path: root/templates/spiff/invoice.html.diff
blob: fd9637529a152d74cb174db8bd82fd93851c78ec (plain) 
    

  1. --- invoice.html.orig   2005-08-14 13:53:10.000000000 +0200
    2. 

  2. +++ invoice.html    2002-06-15 17:59:45.000000000 +0200
    3. 

  3. @@ -1,282 +1,276 @@
    4. 

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

  5. +<table width="100%">
    6. 

  6. +<tr valign="bottom">
    7. 

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

  8. +<td>
    9. 

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

  10.  
    11. 

  11. -<body bgcolor=ffffff>
    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. + <%end shiptoname%>
    22. 

  22. +</td>
    23. 

  23. +<td align="right" rowspan="3">
    24. 

  24. +<table>
    25. 

  25. +<tr valign="bottom">
    26. 

  26. +<th align="left" colspan="3">
    27. 

  27. +<h2>FAKTURA</h2>
    28. 

  28. +</th>
    29. 

  29. +</tr>
    30. 

  30. +
    31. 

  31. +<tr>
    32. 

  32. +<th align="right">Fakturanummer:</th>
    33. 

  33. +<td>&nbsp;</td>
    34. 

  34. +<td><%invnumber%></td>
    35. 

  35. +</tr>
    36. 

  36. +
    37. 

  37. +<%if businessnumber%>
    38. 

  38. +<tr>
    39. 

  39. +<th align="right">CVR-nummer:</th>
    40. 

  40. +<td>&nbsp;</td>
    41. 

  41. +<td><%businessnumber%></td>
    42. 

  42. +</tr>
    43. 

  43. +<%end businessnumber%>
    44. 

  44. +
    45. 

  45. +<tr>
    46. 

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

  47. +<td width="10">&nbsp;</td>
    48. 

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

  49. +</tr>
    50. 

  50. +
    51. 

  51. +<tr>
    52. 

  52. +<th align="right">Forfaldsdato:</th>
    53. 

  53. +<td width="10">&nbsp;</td>
    54. 

  54. +<td><%duedate%></td>
    55. 

  55. +</tr>
    56. 

  56.  
    57. 

  57. -<table width=100%>
    58. 

  58. -<tr valign=bottom>
    59. 

  59. -  <td width=10>&nbsp;</td>
    60. 

  60. -  <td>
    61. 

  61. -  
    62. 

  62. -  <table width=100%>
    63. 

  63. -  <tr>
    64. 

  64. -    <td>
    65. 

  65. -      <h4>
    66. 

  66. -      <%company%>
    67. 

  67. -      <br><%address%>
    68. 

  68. -      </h4>
    69. 

  69. -    </td>
    70. 

  70. -
    71. 

  71. -    <td align=right>
    72. 

  72. -      <h4>
    73. 

  73. -      Tlf.: <%tel%>
    74. 

  74. -      <br>Fax: <%fax%>
    75. 

  75. -      </h4>
    76. 

  76. -    </td>
    77. 

  77. -  </tr>
    78. 

  78. -
    79. 

  79. -  <tr>
    80. 

  80. -    <th colspan=3>
    81. 

  81. -      <h4>F A K T U R A</h4>
    82. 

  82. -    </th>
    83. 

  83. -  </tr>
    84. 

  84. -
    85. 

  85. -  </table>
    86. 

  86. -
    87. 

  87. -
    88. 

  88. -  <table width=100% callspacing=0 cellpadding=0>
    89. 

  89. -    
    90. 

  90. -  <tr>
    91. 

  91. -    <td align=right>
    92. 

  92. -    <table>
    93. 

  93. -    <tr>
    94. 

  94. -      <th align=right>Fakturadato</th><td width=10>&nbsp;</td><td><%invdate%></td>
    95. 

  95. -    </tr>
    96. 

  96. -  
    97. 

  97. -    <tr>
    98. 

  98. -      <th align=right>Betalingsdato</th><td width=10>&nbsp;</td><td><%duedate%></td>
    99. 

  99. -    </tr>
    100. 

  100. -
    101. 

  101. -    <tr>
    102. 

  102. -      <th align=right>Fakturanummer</th><td>&nbsp;</td><td><%invnumber%></td></tr>
    103. 

  103. -    </tr>
    104. 

  104. -  
    105. 

  105.  <!--
    106. 

  106. -    <tr>
    107. 

  107. -      <th align=right>Ekspederet af:</th><td>&nbsp;</td><td><%username%></td>
    108. 

  108. -    </tr>
    109. 

  109. +<tr>
    110. 

  110. +<th align="left">Ekspedient:</th><td>&nbsp;</td><td><%username%></td>
    111. 

  111. +</tr>
    112. 

  112.  -->
    113. 

  113.  
    114. 

  114. -    <tr>
    115. 

  115. -      <td>&nbsp;</td>
    116. 

  116. -    </tr>
    117. 

  117. -    </td>
    118. 

  118. -    </table>
    119. 

  119. -  </tr>
    120. 

  120. -
    121. 

  121. -  <tr>
    122. 

  122. -    <td>
    123. 

  123. -    <table width=100%>
    124. 

  124. -    <tr bgcolor=000000>
    125. 

  125. -      <th align=left><font color=ffffff>Faktureringsadresse:</th>
    126. 

  126. -     <%if shiptoname%>
    127. 

  127. -      <th align=left><font color=ffffff>Leveringsadresse:</th>
    128. 

  128. -     <%end shiptoname%>
    129. 

  129. -    </tr>
    130. 

  130. +<tr>
    131. 

  131. +<td>&nbsp;</td>
    132. 

  132. +</tr>
    133. 

  133. +</table>
    134. 

  134. +</td>
    135. 

  135. +</tr>
    136. 

  136. +
    137. 

  137. +<tr valign="bottom">
    138. 

  138. +<th align="left">Faktureringsadresse:</th>
    139. 

  139. + <%if shiptoname%>
    140. 

  140. +<th align="left">Leveringsadresse:</th>
    141. 

  141. + <%end shiptoname%>
    142. 

  142. +</tr>
    143. 

  143.  
    144. 

  144.  <!--
    145. 

  145. -     other variables which can be use:
    146. 

  146. -     contact, shiptocontact, shiptophone, shiptofax
    147. 

  147. +andre mulige variable: contact, shiptocontact, shiptophone, shiptofax
    148. 

  148.  -->
    149. 

  149.  
    150. 

  150. -    <tr>
    151. 

  151. -      <td><%name%>
    152. 

  152. -      <br><%address1%>
    153. 

  153. -      <%if address2%>
    154. 

  154. -<br><%address2%>
    155. 

  155. -<%end address2%>
    156. 

  156. -      <br><%city%> <%state%> <%zipcode%>
    157. 

  157. -      <%if country%>
    158. 

  158. -<%country%>
    159. 

  159. -<%end country%>
    160. 

  160. -      </td>
    161. 

  161. -      
    162. 

  162. -     <%if shiptoname%>
    163. 

  163. -      <td><%shiptoname%>
    164. 

  164. -      <br><%shiptoaddress1%>
    165. 

  165. -      <%if shiptoaddress2%>
    166. 

  166. -<br><%shiptoaddress2%>
    167. 

  167. -<%end shiptoaddress2%>
    168. 

  168. -      <br><%shiptocity%> <%shiptostate%> <%shiptozipcode%>
    169. 

  169. -      <%if shiptocountry%>
    170. 

  170. -<%shiptocountry%>
    171. 

  171. -<%end shiptocountry%>
    172. 

  172. -      </td>
    173. 

  173. -     <%end shiptoname%>
    174. 

  174. -    </tr>
    175. 

  175. -    </table>
    176. 

  176. -    </td>
    177. 

  177. -  </tr>
    178. 

  178. -
    179. 

  179. -  <tr>
    180. 

  180. -    <td>&nbsp;</td>
    181. 

  181. -  </tr>
    182. 

  182. -  
    183. 

  183. -  <tr>
    184. 

  184. -    <td>
    185. 

  185. -    <table width=100%>
    186. 

  186. -    <tr bgcolor=000000>
    187. 

  187. -<!--      <th align=right><font color=ffffff>No.</th>  -->
    188. 

  188. -      <th align=left><font color=ffffff>Varenummer</th>
    189. 

  189. -      <th align=left><font color=ffffff>Beskrivelse</th>
    190. 

  190. -      <th><font color=ffffff>Antal</th>
    191. 

  191. -      <th>&nbsp;</th>
    192. 

  192. -      <th><font color=ffffff>Pris</th>
    193. 

  193. -      <th><font color=ffffff>Rabat</th>
    194. 

  194. -      <th><font color=ffffff>Beløb</th>
    195. 

  195. -    </tr>
    196. 

  196. +<tr valign="top">
    197. 

  197. +<td><b><%name%></b><br>
    198. 

  198. +<%addr1%><br>
    199. 

  199. +<%addr2%><br>
    200. 

  200. +<%addr3%><br>
    201. 

  201. +<%addr4%></td>
    202. 

  202. + <%if shiptoname%>
    203. 

  203. +<td><b><%shiptoname%></b><br>
    204. 

  204. +<%shiptoaddr1%><br>
    205. 

  205. +<%shiptoaddr2%><br>
    206. 

  206. +<%shiptoaddr3%><br>
    207. 

  207. +<%shiptoaddr4%></td>
    208. 

  208. + <%end shiptoname%>
    209. 

  209. +</tr>
    210. 

  210. +</table>
    211. 

  211. +</td>
    212. 

  212. +</tr>
    213. 

  213. +
    214. 

  214. +<tr>
    215. 

  215. +<td>&nbsp;</td>
    216. 

  216. +</tr>
    217. 

  217. +
    218. 

  218. +<tr>
    219. 

  219. +<td>
    220. 

  220. +<table width="100%">
    221. 

  221. +<tr>
    222. 

  222. +<!-- <th align=right>Løbenr.</th> -->
    223. 

  223. +<th align="left">Varenr.</th>
    224. 

  224. +<th align="left">Beskrivelse</th>
    225. 

  225. +<th colspan="2">Antal</th>
    226. 

  226. +<th>Pris</th>
    227. 

  227. +<th>Rabat</th>
    228. 

  228. +<th>Beløb</th>
    229. 

  229. +</tr>
    230. 

  230.  
    231. 

  231.  <%foreach number%>
    232. 

  232. -    <tr valign=top>
    233. 

  233. -<!--      <td align=right><%runningnumber%>.</td>
    234. 

  234. -adjust the colspan if you include this to shift subtotal one to the right
    235. 

  235. +<tr valign="top">
    236. 

  236. +<!--
    237. 

  237. +<td align=right><%runningnumber%>.</td>
    238. 

  238. +Justér "colspan" hvis du inkluderer løbenummeret, så subtotal flyttes et felt til højre
    239. 

  239.  -->
    240. 

  240. -      <td><%number%></td>
    241. 

  241. -      <td><%description%></td>
    242. 

  242. -      <td align=right><%qty%></td>
    243. 

  243. -      <td><%unit%></td>
    244. 

  244. -      <td align=right><%sellprice%></td>
    245. 

  245. -      <td align=right><%discount%></td>
    246. 

  246. -      <td align=right><%linetotal%></td>
    247. 

  247. -    </tr>
    248. 

  248. -<%end number%>
    249. 

  249. +<td><%number%></td>
    250. 

  250. +<td><%description%></td>
    251. 

  251. +<td align="right"><%qty%></td>
    252. 

  252. +<td><%unit%></td>
    253. 

  253. +<td align="right"><%sellprice%></td>
    254. 

  254. +<td align="right"><%discount%></td>
    255. 

  255. +<td align="right"><%linetotal%></td>
    256. 

  256. +</tr>
    257. 

  257. + <%end number%>
    258. 

  258.  
    259. 

  259.  <!--
    260. 

  260. -you can also use netprice instead of sellprice if you
    261. 

  261. -don't want to show the discount
    262. 

  262. -netprice = sellprice - discount
    263. 

  263. -to show the percentage for a discount use <%discountrate%>
    264. 

  264. +Du kan også bruge "netprice" istedet for "sellprice" hvis du ikke
    265. 

  265. +vil vise rabatten: netprice = sellprice - discount
    266. 

  266.  -->
    267. 

  267. +<tr>
    268. 

  268. +<td colspan="7">
    269. 

  269. +<hr noshade>
    270. 

  270. +</td>
    271. 

  271. +</tr>
    272. 

  272.  
    273. 

  273. -    <tr>
    274. 

  274. -      <td colspan=7><hr noshade></td>
    275. 

  275. -    </tr>
    276. 

  276. -    
    277. 

  277. -    <tr>
    278. 

  278. +<tr>
    279. 

  279.  <%if taxincluded%>
    280. 

  280. -      <th colspan=5 align=right>Total</th>
    281. 

  281. -      <td colspan=2 align=right><%invtotal%></td>
    282. 

  282. +<th colspan="5" align="right">Total:</th>
    283. 

  283. +<td colspan="2" align="right"><%invtotal%></td>
    284. 

  284.  <%end taxincluded%>
    285. 

  285.  <%if not taxincluded%>
    286. 

  286. -      <th colspan=5 align=right>Subtotal</th>
    287. 

  287. -      <td colspan=2 align=right><%subtotal%></td>
    288. 

  288. -<%end taxincluded%>
    289. 

  289. -    </tr>
    290. 

  290. +<th colspan="5" align="right">Subtotal:</th>
    291. 

  291. +<td colspan="2" align="right"><%subtotal%></td>
    292. 

  292. +<%end taxincluded%></tr>
    293. 

  293.  
    294. 

  294.  <%foreach tax%>
    295. 

  295. -    <tr>
    296. 

  296. -      <th colspan=5 align=right><%taxdescription%> på <%taxbase%> @ <%taxrate%> %</th>
    297. 

  297. -      <td colspan=2 align=right><%tax%></td>
    298. 

  298. -    </tr>
    299. 

  299. +<tr>
    300. 

  300. +<th colspan="5" align="right"><%taxdescription%> (<%taxrate%>%) af
    301. 

  301. +<%taxbase%>:</th>
    302. 

  302. +<td colspan="2" align="right"><%tax%></td>
    303. 

  303. +</tr>
    304. 

  304.  <%end tax%>
    305. 

  305. -
    306. 

  306.  <%if paid%>
    307. 

  307. -    <tr>
    308. 

  308. -      <th colspan=5 align=right>Allerede betalt</th>
    309. 

  309. -      <td colspan=2 align=right>- <%paid%></td>
    310. 

  310. -    </tr>
    311. 

  311. +<tr>
    312. 

  312. +<th colspan="5" align="right">Allerede betalt:</th>
    313. 

  313. +<td colspan="2" align="right">- <%paid%></td>
    314. 

  314. +</tr>
    315. 

  315.  <%end paid%>
    316. 

  316.  
    317. 

  317. -    <tr>
    318. 

  318. -      <td colspan=3>&nbsp;</td>
    319. 

  319. -      <td colspan=4><hr noshade></td>
    320. 

  320. -    </tr>
    321. 

  321. -
    322. 

  322. -    <tr>
    323. 

  323. -      <td colspan=3>Betalingsfrist <b><%terms%></b> dage</td>
    324. 

  324. -      <th colspan=2 align=right>At betale</th>
    325. 

  325. -      <th colspan=2 align=right><%total%></th>
    326. 

  326. -    </tr>
    327. 

  327. -
    328. 

  328. -    <tr>
    329. 

  329. -      <td>&nbsp;</td>
    330. 

  330. -    </tr>
    331. 

  331. -
    332. 

  332. -    </table>
    333. 

  333. -    </td>
    334. 

  334. -  </tr>
    335. 

  335. -
    336. 

  336. -<tr>
    337. 

  337. -  <td>
    338. 

  338. -  <table width=100%>
    339. 

  339. -    <tr valign=top>
    340. 

  340. +<tr>
    341. 

  341. +<td colspan="5">&nbsp;</td>
    342. 

  342. +<td colspan="2">
    343. 

  343. +<hr noshade>
    344. 

  344. +</td>
    345. 

  345. +</tr>
    346. 

  346. +
    347. 

  347. +<tr>
    348. 

  348. +<td colspan="3">Betalingsfrist <b><%terms%></b> dage</td>
    349. 

  349. +<th colspan="2" align="right">At betale:</th>
    350. 

  350. +<th colspan="2" align="right"><%total%></th>
    351. 

  351. +</tr>
    352. 

  352. +
    353. 

  353. +<tr>
    354. 

  354. +<td colspan="5">&nbsp;</td>
    355. 

  355. +<td colspan="2">
    356. 

  356. +<hr noshade>
    357. 

  357. +</td>
    358. 

  358. +</tr>
    359. 

  359. +
    360. 

  360. +<tr>
    361. 

  361. +<td>&nbsp;</td>
    362. 

  362. +</tr>
    363. 

  363. +</table>
    364. 

  364. +</td>
    365. 

  365. +</tr>
    366. 

  366. +
    367. 

  367. +<tr>
    368. 

  368. +<td>
    369. 

  369. +<table width="100%">
    370. 

  370. +<tr valign="top">
    371. 

  371.  <%if notes%>
    372. 

  372. -      <td>Bemærkninger</td>
    373. 

  373. -      <td><%notes%></td>
    374. 

  374. +<td>Bemærkninger:</td>
    375. 

  375. +<td><%notes%></td>
    376. 

  376.  <%end notes%>
    377. 

  377. -      <td align=right>
    378. 

  378. -      Alle priser i <b><%currency%></b>.
    379. 

  379. -      <br><%shippingpoint%>
    380. 

  380. -      </td>
    381. 

  381. -    </tr>
    382. 

  382. -
    383. 

  383. -  </table>
    384. 

  384. -  </td>
    385. 

  385. -</tr>
    386. 

  386. -
    387. 

  387. -<tr><td>&nbsp;</td></tr>
    388. 

  388. -  
    389. 

  389. -<tr>
    390. 

  390. -  <th colspan=7>
    391. 

  391. -  <br>Tak for handelen!
    392. 

  392. -  </th>
    393. 

  393. -</tr>
    394. 

  394. -
    395. 

  395. -<tr><td>&nbsp;</td></tr>
    396. 

  396. -
    397. 

  397. -<tr>
    398. 

  398. -  <td>
    399. 

  399. -  <table width=100%>
    400. 

  400. -  <tr valign=top>
    401. 

  401. -    <td><font size=-3>
    402. 

  402. -    Betalingsfrist <%terms%> dage fra fakturadato. Betaling herefter påregnes
    403. 

  403. -    1.5% per påbegyndt måned startende <%duedate%> og indtil det fulde beløb
    404. 

  404. -    er betalt. Returnerede varer modregnes 10% i ekspeditionsgebyr.
    405. 

  405. -    Et returnummer skal tildeles af <%company%> før varer returneres.
    406. 

  406. -    Returvarer skal forsendes forudbetalt og forsvarligt forsikret.
    407. 

  407. -    <%company%> kan ikke drages til ansvar for skade under transport.
    408. 

  408. -    </font>
    409. 

  409. -    </td>
    410. 

  410. -    <td width=150>
    411. 

  411. -    X <hr noshade>
    412. 

  412. -    </td>
    413. 

  413. -  </tr>
    414. 

  414. -  </table>
    415. 

  415. -  </td>
    416. 

  416. +<td>
    417. 

  417. +<table width="100%">
    418. 

  418. + <%if taxincluded%>
    419. 

  419. +<tr valign="top">
    420. 

  420. +<td align="right">Alle beløb er <strong>inklusive moms</strong>.</td>
    421. 

  421. +</tr>
    422. 

  422. + <%end taxincluded%>
    423. 

  423. +<!-- afgifts- og momskoder
    424. 

  424. + <%foreach tax%>
    425. 

  425. +<tr valign="top">
    426. 

  426. +<td align="right"><%taxdescription%> noteret som <%taxnumber%></td>
    427. 

  427. +</tr>
    428. 

  428. + <%end tax%>
    429. 

  429. +-->
    430. 

  430. +<tr valign="top">
    431. 

  431. +</td>
    432. 

  432. +<td align="right">Alle priser i <strong><%currency%></strong><br>
    433. 

  433. +<%shippingpoint%></td>
    434. 

  434. +</tr>
    435. 

  435. +</table>
    436. 

  436. +</tr>
    437. 

  437. +</table>
    438. 

  438. +</td>
    439. 

  439.  </tr>
    440. 

  440.  
    441. 

  441. -<%foreach tax%>
    442. 

  442. -  <tr>
    443. 

  443. -    <th colspan=7 align=left><font size=-2><%taxdescription%> noteret som <%taxnumber%></th>
    444. 

  444. -  </tr>
    445. 

  445. -<%end tax%>
    446. 

  446. +<tr>
    447. 

  447. +<td>&nbsp;</td>
    448. 

  448. +</tr>
    449. 

  449.  
    450. 

  450. -<%if taxincluded%>
    451. 

  451. -  <tr>
    452. 

  452. -    <th colspan=7 align=left><font size=-2>Alle beløb er inklusive moms.</th>
    453. 

  453. -  </tr>
    454. 

  454. -<%end taxincluded%>
    455. 

  455. +<tr>
    456. 

  456. +<td>
    457. 

  457. +<p>
    458. 

  458. +<b>Tak for handelen!</b>
    459. 

  459. +<p>
    460. 

  460. +<%company%><br>
    461. 

  461. +<%address%><br>
    462. 

  462. +<%if tel%>
    463. 

  463. +Telefon: <%tel%><br>
    464. 

  464. +<%end tel%>
    465. 

  465. + <%if fax%>
    466. 

  466. +Fax: <%fax%><br>
    467. 

  467. + <%end fax%>
    468. 

  468. +<p align="center">
    469. 

  469. +Indbetaling bedes ske til Merkur Andelskasse på konto 8401-1028192.
    470. 

  470. +</td>
    471. 

  471. +</tr>
    472. 

  472.  
    473. 

  473. -<!-- business number
    474. 

  474. -  <tr>
    475. 

  475. -    <th colspan=7 align=left><font size=-2>CVR-nummer: <%businessnumber%></font></th>
    476. 

  476. -  </tr>
    477. 

  477. --->
    478. 

  478. +<tr>
    479. 

  479. +<td colspan="7">
    480. 

  480. +<hr noshade>
    481. 

  481. +</td>
    482. 

  482. +</tr>
    483. 

  483.  
    484. 

  484. -<!-- banking information
    485. 

  485. -  <tr>
    486. 

  486. -    <th colspan=7 align=left>Bank-oplysninger:
    487. 

  487. -    <br>Bank
    488. 

  488. -    <br>Banknummer
    489. 

  489. -    <br>Kontonummer
    490. 

  490. -    </td>
    491. 

  491. -  </tr>
    492. 

  492. +<tr>
    493. 

  493. +<td>
    494. 

  494. +<table width="100%">
    495. 

  495. +<tr valign="top">
    496. 

  496. +<td><font size="-3">Betalingsfrist <%terms%> dage fra fakturadato.
    497. 

  497. +Betaling herefter påregnes 1.5% per påbegyndt måned startende
    498. 

  498. +<%duedate%> og indtil det fulde beløb er betalt. Returnerede varer
    499. 

  499. +modregnes 10% i ekspeditionsgebyr. Et returnummer skal tildeles af
    500. 

  500. +<%company%> før varer returneres. Returvarer skal forsendes
    501. 

  501. +forudbetalt og forsvarligt forsikret. <%company%> kan ikke drages
    502. 

  502. +til ansvar for skade under transport.</font></td>
    503. 

  503. +<!-- Linje til underskrift
    504. 

  504. +<td width=150>
    505. 

  505. +X <hr noshade>
    506. 

  506. +</td>
    507. 

  507.  -->
    508. 

  508. -
    509. 

  509. +</tr>
    510. 

  510.  </table>
    511. 

  511. +</td>
    512. 

  512. +</tr>
    513. 

  513.  
    514. 

  514. +</table>
    515. 

  515.  </td>
    516. 

  516.  </tr>
    517. 

  517.  </table>
    518. 

  518. -
    519. 

  519.  </body>
    520. 

  520.  </html>
    521. 

  521. -
    522.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 02:40:29 +0000