Add/update data for 2017.skat-2017moms-2017-12-2

9 files changed, 156 insertions, 25 deletions

diff --git a/data/2016/expenses/dkhm.ledger b/data/2016/expenses/dkhm.ledger
index 84c35ee..ddab775 100644
--- a/data/2016/expenses/dkhm.ledger
+++ b/data/2016/expenses/dkhm.ledger
@@ -28,7 +28,7 @@
 	expenses:internet        144
 	liabilities:tax:expenses  36
 
-12-01=2018-01-09 dkhm 6886896
+12-01=2017-01-09 dkhm 6886896
 	liabilities:payable:hosting
 	expenses:internet        36
 	liabilities:tax:expenses  9
diff --git a/data/2017/expenses/bahn.ledger b/data/2017/expenses/bahn.ledger
index 91b0b6b..0b6ab40 100644
--- a/data/2017/expenses/bahn.ledger
+++ b/data/2017/expenses/bahn.ledger
@@ -10,9 +10,11 @@
 	liabilities:payable:travel:train
 	expenses:non-vat:travel  83,40 € @@ 626,73
 
+; FIXME: avoid rounding error
 10-21=10-24 bahn KDGK74
 	liabilities:payable:travel:train
 	expenses:non-vat:travel  13,50 € @@ 101,51
+	expenses:non-vat:travel  -0,01
 	expenses:non-vat:travel  -9 € @@ 67,67
 	assets:advances:jonas     4,50 € @@ 33,84 ; Kurt Gramlich
 	assets:advances:siri      4,50 € @@ 33,84 ; Siri
diff --git a/data/2017/expenses/bytemark.ledger b/data/2017/expenses/bytemark.ledger
index 1aa2c62..2a055ea 100644
--- a/data/2017/expenses/bytemark.ledger
+++ b/data/2017/expenses/bytemark.ledger
@@ -2,7 +2,7 @@
 	liabilities:payable:hosting
 	expenses:eu-vat:hosting  97,20 £ @@ 863,35
 
-05-11=05-15 bytemark
+05-11=05-16 bytemark
 	liabilities:payable:hosting
 	expenses:eu-vat:hosting  97,20 £ @@ 870,24
 
diff --git a/data/2017/expenses/dkhm.ledger b/data/2017/expenses/dkhm.ledger
index b0cfe09..9620a8b 100644
--- a/data/2017/expenses/dkhm.ledger
+++ b/data/2017/expenses/dkhm.ledger
@@ -18,7 +18,7 @@
 	expenses:internet        144
 	liabilities:tax:expenses  36
 
-12-01 dkhm 7650410
+12-01=2018-01-08 dkhm 7650410
 	liabilities:payable:hosting
 	expenses:internet        36
 	liabilities:tax:expenses  9
diff --git a/data/2017/expenses/dsb.ledger b/data/2017/expenses/dsb.ledger
index 3e250ca..431a549 100644
--- a/data/2017/expenses/dsb.ledger
+++ b/data/2017/expenses/dsb.ledger
@@ -36,7 +36,7 @@
 	expenses:non-vat:travel  -152
 	assets:advances:siri      152 ; Siri
 
-09-03 dsb 55B2ML46 ; from:Aarhus to:Holbæk
+09-03=09-04 dsb 55B2ML46 ; from:Aarhus to:Holbæk
 	assets:advances:jonas
 	expenses:non-vat:travel  388
 
@@ -53,9 +53,9 @@
 	expenses:non-vat:travel  418
 
 12-17 dsb 55BS6H77 ; from:Ølgod to:Holbæk
-	liabilities:payable:travel:train
+	assets:advances:jonas
 	expenses:non-vat:travel  388
 
 12-17 dsb 55BS4BUP ; from:Esbjerg to:Roskilde ticket:seat
-	liabilities:payable:travel:train
+	assets:advances:jonas
 	expenses:non-vat:travel  60
diff --git a/data/2017/expenses/fibia.ledger b/data/2017/expenses/fibia.ledger
new file mode 100644
index 0000000..16af9cf
--- /dev/null
+++ b/data/2017/expenses/fibia.ledger
@@ -0,0 +1,12 @@
+; FIXME: locate invoice and check date and tax amount
+07-21=09-01 fibia
+	liabilities:payable:internet
+	expenses:non-vat:internet  2076,19
+	liabilities:tax:expenses   519,05
+
+10-02 fibia
+	liabilities:payable:internet
+	expenses:non-vat:internet   79,20
+	expenses:non-vat:internet  175,20
+	expenses:non-vat:internet  -56
+	liabilities:tax:expenses    49,60
diff --git a/data/2017/expenses/misc.ledger b/data/2017/expenses/misc.ledger
index 085adca..a261403 100644
--- a/data/2017/expenses/misc.ledger
+++ b/data/2017/expenses/misc.ledger
@@ -1,11 +1,15 @@
 04-21 BJTrading 1346909
 	liabilities:payable:durables
-	expenses:hardware         109,45
-	expenses:hardware          32
-	expenses:non-vat:delivery  20
+	expenses:hardware          87,56
+	expenses:hardware          25,60
+	expenses:non-vat:delivery  16
 	expenses:non-vat:bank:fees  1
 	liabilities:tax:expenses   32,29
 
+05-19 computersalg
+	liabilities:payable:durables
+	assets:advances:kass  759,59
+
 06-16 proshop 43075062
 	liabilities:payable:durables
 	expenses:hardware         390,40
@@ -14,7 +18,18 @@
 	expenses:delivery          31,20
 	liabilities:tax:expenses  529,40
 
-07-19 proshop 43155474
+06-17=06-20 wow TWZPF1
+	liabilities:payable:travel:plane
+	expenses:non-vat:travel  10677
+	expenses:non-vat:travel  -5338,50
+	assets:advances:siri      5338,50
+
+; FIXME: locate the original currency amount (dollar? canadian dollar?)
+07-12 canada-imm V316504484
+	liabilities:payable:travel:fees
+	expenses:non-vat:travel  36,07
+
+07-19=07-20 proshop 43155474
 	liabilities:payable:durables
 	expenses:hardware         613,60
 	expenses:delivery          31,20
@@ -29,6 +44,16 @@
 	expenses:delivery         -23,20
 	liabilities:tax:expenses  118
 
+09-04 metro
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  24
+
+09-05 dustin 0717879
+	liabilities:payable:durables
+	expenses:hardware         1279,20
+	expenses:delivery          103,20
+	liabilities:tax:expenses   345,60
+
 09-07 proshop 43248818
 	liabilities:payable:durables
 	expenses:hardware         336,80
@@ -40,8 +65,48 @@
 	assets:advances:siri      395,20 ; Siri
 	assets:advances:siri       98,80 ; Siri
 
-11-17 sncf ROVQLO
+09-26 post
+	liabilities:payable:customs
+	expenses:non-vat:customs:fees  632
+
+; FIXME: cancel bogus order!
+10-17 olimex W-JS121017-2
+	liabilities:payable:durables
+	expenses:eu-vat:durables  264,02 € @@ 1985,38
+
+11-01=11-02 olimex W-JS231017-1
+	liabilities:payable:durables
+	expenses:eu-vat:durables  579,10 € @@ 4353,16
+
+10-21=10-24 sncf ROVQLO
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  130 € @@ 977,47
+	expenses:non-vat:travel  -65 € @@ 488,74
+	assets:advances:siri      65 € @@ 488,74 ; Siri
+
+11-22=11-24 sncf TBWGTB
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  10 € @@ 75,17
+
+11-26=11-28 sncf TKSYDW
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  40 € @@ 300,71
+
+11-29=11-30 sncf QQGTCE
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  10 € @@ 75,18
+
+; FIXME: ticket missing
+12-04 sncf
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  21,15
+
+; FIXME: ticket missing
+12-05 sncf
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  21,15
+
+; FIXME: ticket missing
+12-05 sncf
 	liabilities:payable:travel:train
-	expenses:non-vat:travel  110 € @@ 67,67
-	expenses:non-vat:travel  -55
-	assets:advances:siri      55 ; Siri
+	expenses:non-vat:travel  21,15
diff --git a/data/2017/expenses/scaleway.ledger b/data/2017/expenses/scaleway.ledger
new file mode 100644
index 0000000..baa4a5a
--- /dev/null
+++ b/data/2017/expenses/scaleway.ledger
@@ -0,0 +1,47 @@
+01-06=01-10 scaleway 138905
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,45
+
+02-06=02-09 scaleway 153779
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,46
+
+03-03=03-07 scaleway 169206
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,45
+
+04-05=04-10 scaleway 186954
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,46
+
+05-05=05-09 scaleway 205278
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,46
+
+06-03=06-08 scaleway 225216
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,47
+
+07-05=07-10 scaleway 246209
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,46
+
+08-04=08-10 scaleway 267784
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,47
+
+09-05=09-08 scaleway 288720
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,47
+
+10-10=10-16 scaleway 302571
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,48
+
+11-02=11-07 scaleway 335513
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,48
+
+12-01=12-05 scaleway 366718
+	liabilities:payable:hosting
+	expenses:eu-vat:hosting  2,99 € @@ 22,59
diff --git a/data/2017/expenses/unotel.ledger b/data/2017/expenses/unotel.ledger
index 80c6d7f..5e67950 100644
--- a/data/2017/expenses/unotel.ledger
+++ b/data/2017/expenses/unotel.ledger
@@ -1,4 +1,4 @@
-01-01 unot 4175487
+01-01=01-02 unot 4175487
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
@@ -8,8 +8,8 @@
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
 
-03-19 unot 4198024
-	liabilities:payable:phone
+03-19=04-03 unot 4198024
+	liabilities:payable:internet
 	expenses:non-vat:internet  525,60
 	liabilities:tax:expenses   131,40
 
@@ -18,12 +18,17 @@
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
 
-06-19 unot 4223587
-	liabilities:payable:phone
+06-01=06-23 unot 4219482
+	liabilities:payable:internet
+	expenses:non-vat:internet  966,99
+	liabilities:tax:expenses   241,75
+
+06-19=07-03 unot 4223587
+	liabilities:payable:internet
 	expenses:non-vat:internet  525,60
 	liabilities:tax:expenses   131,40
 
-07-01 unot 4227788
+07-01=07-03 unot 4227788
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
@@ -33,12 +38,12 @@
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
 
-09-19 unot 4249753
-	liabilities:payable:phone
+09-19=10-03 unot 4249753
+	liabilities:payable:internet
 	expenses:non-vat:internet  525,60
 	liabilities:tax:expenses   131,40
 
-10-01 unot 4252901
+10-01=10-02 unot 4252901
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
@@ -48,7 +53,7 @@
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,39
 
-12-19 unot 4275981
-	liabilities:payable:phone
+12-19=2018-01-01 unot 4275981
+	liabilities:payable:internet
 	expenses:non-vat:internet  525,60
 	liabilities:tax:expenses   131,40