A ton of updates...

8 files changed, 77 insertions, 40 deletions

diff --git a/data/2012/assets/84011036773.csv.local.rules b/data/2012/assets/84011036773.csv.local.rules
index a0c9899..7a13047 100644
--- a/data/2012/assets/84011036773.csv.local.rules
+++ b/data/2012/assets/84011036773.csv.local.rules
@@ -7,6 +7,9 @@ if
 if DK-NOTA21600 Q8 SERVICE - 8006
  account2 assets:advances:jonas
 
+if DK-NOTA67087 UNOTEL.DK
+ account2 assets:advances:siri
+
 #if LES COMPTOIRS DU BOE -
 #  account2 expenses:repræsentation
 
diff --git a/data/2012/assets/84011036773.ledger b/data/2012/assets/84011036773.ledger
index 6ea189f..6894084 100644
--- a/data/2012/assets/84011036773.ledger
+++ b/data/2012/assets/84011036773.ledger
@@ -319,8 +319,8 @@
     assets:bank:dr. jones        -201.65 kr
 
 2012/04/27=2012/04/27 DK-NOTA67087 UNOTEL.DK -
-    liabilities:payable:phone     201.65 kr
-    assets:bank:dr. jones        -201.65 kr
+    assets:advances:siri      201.65 kr
+    assets:bank:dr. jones    -201.65 kr
 
 2012/04/27=2012/04/27 DK-NOTA67120 UNOTEL.DK -
     liabilities:payable:phone     201.65 kr
diff --git a/data/2012/expenses/dkhm.ledger b/data/2012/expenses/dkhm.ledger
index a19e1ed..f49eb0e 100644
--- a/data/2012/expenses/dkhm.ledger
+++ b/data/2012/expenses/dkhm.ledger
@@ -1,14 +1,14 @@
-01-01 dkhm 3090586
+01-01=02-08 dkhm 3090586
 	liabilities:payable:hosting
 	expenses:internet     72
 	liabilities:tax:expenses  18
 
-03-01 dkhm 3207006
+03-01=04-10 dkhm 3207006
 	liabilities:payable:hosting
 	expenses:internet     72
 	liabilities:tax:expenses  18
 
-09-02 dkhm 3573725
+09-02=10-03 dkhm 3573725
 	liabilities:payable:hosting
 	expenses:internet     144
 	liabilities:tax:expenses  36
diff --git a/data/2012/expenses/dsb.ledger b/data/2012/expenses/dsb.ledger
new file mode 100644
index 0000000..32fbb66
--- /dev/null
+++ b/data/2012/expenses/dsb.ledger
@@ -0,0 +1,31 @@
+01-24 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  3740
+
+01-30 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  330
+
+03-07 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  103
+
+04-10 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  113
+
+04-10 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  498
+
+06-29 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  346
+
+07-02 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  382
+
+11-26 dsb
+	liabilities:payable:travel:train
+	expenses:non-vat:travel  358
diff --git a/data/2012/expenses/persp.ledger b/data/2012/expenses/persp.ledger
index f8a6e8f..54105f3 100644
--- a/data/2012/expenses/persp.ledger
+++ b/data/2012/expenses/persp.ledger
@@ -1,51 +1,44 @@
-01-01 persp 6102434574032; Girocode: +71< 000002015821404+0081354804<
+01-01=01-30 persp 6102434574032; Girocode: +71< 000002015821404+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-01-30
 
-01-17 persp 6189594574035; Girocode: +71< 000002038527715+0081354804<
+01-17=02-29 persp 6189594574035; Girocode: +71< 000002038527715+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	expenses:non-vat      200
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-02-29
 
-02-16 persp 6274304574036; Girocode: +71< 000002038697427+0081354804<
+02-16=02-29 persp 6274304574036; Girocode: +71< 000002038697427+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	expenses:non-vat      100
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-02-29
 
-03-16 persp 6357264574037; Girocode: +71< 000002058527728+0081354804<
+03-16=03-27 persp 6357264574037; Girocode: +71< 000002058527728+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-03-27
 
-04-01 persp
+04-01=02-29 persp
 	liabilities:payable:internet
 	expenses:internet     214,40
 	expenses:non-vat      100
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-02-29
 
 04-13 persp 6442114574039
 	liabilities:payable:internet
 	expenses:internet     214,40
 	liabilities:tax:expenses  53,60
 
-05-21 persp 6529414574030; Girocode: +71< 000002119811459+0081354804<
+05-21=07-11 persp 6529414574030; Girocode: +71< 000002119811459+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	expenses:non-vat      100
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-07-11
 
-06-14 persp 6609354574032; Girocode: +71< 000002116670130+0081354804<
+06-14=07-11 persp 6609354574032; Girocode: +71< 000002116670130+0081354804<
 	liabilities:payable:internet
 	expenses:internet     214,40
 	expenses:non-vat      100
 	liabilities:tax:expenses  53,60
-	; Payment-Date: 2012-07-11
diff --git a/data/2012/expenses/unotel.ledger b/data/2012/expenses/unotel.ledger
index db4655d..37720a7 100644
--- a/data/2012/expenses/unotel.ledger
+++ b/data/2012/expenses/unotel.ledger
@@ -1,83 +1,93 @@
-01-15 Unotel 3301553
+01-15=01-30 unot 3301553
 	liabilities:payable:phone
 	expenses:non-vat:phone  207,81
 
-03-05 Unotel 3332182
+03-05=03-06 unot 3332182
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-25 Unotel 3356258
+04-25=04-26 unot 
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-26 Unotel 3356564
+04-25=04-26 unot 3356258
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-26 Unotel 3356588
+04-26=04-27 unot 3356564
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-26 Unotel 3356597
+04-26=04-27 unot 3356588
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-26 Unotel 3356606
+04-26=04-27 unot 3356597
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-26 Unotel 3356364
+04-26=04-27 unot 3356606
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-27 Unotel 3356675
+04-26=04-27 unot 3356364
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-27 Unotel 3356695
+04-27 unot 3356675
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-27 Unotel 3356899
+04-27 unot 3356695
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-04-27 Unotel 3356662
+04-27 unot 3356899
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-06-19 unot 3388522
+04-27 unot 3356662
+	liabilities:payable:phone
+	expenses:non-vat:phone    200
+	expenses:non-vat:bank:fees  1,65
+
+06-19=07-11 unot 3388522
 	liabilities:payable:internet
 	expenses:internet         485,60
 	liabilities:tax:expenses  121,40
 
-07-18 Unotel 25334272
+07-18=07-19 unot 25334272
+	liabilities:payable:phone
+	expenses:non-vat:phone    200
+	expenses:non-vat:bank:fees  1,65
+
+07-18=07-19 unot 
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-09-19 unot 3455943
+09-19=10-03 unot 3455943
 	liabilities:payable:internet
 	expenses:internet         542,14
 	liabilities:tax:expenses  135,54
 
-11-12 Unotel 25334272
+11-12 unot 25334272
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
 
-12-10 Unotel 25334272
+12-10 unot 25334272
 	liabilities:payable:phone
 	expenses:non-vat:phone    200
 	expenses:non-vat:bank:fees  1,65
diff --git a/data/2012/expenses/vat.ledger b/data/2012/expenses/vat.ledger
index 480d9c6..a55b53a 100644
--- a/data/2012/expenses/vat.ledger
+++ b/data/2012/expenses/vat.ledger
@@ -5,5 +5,5 @@
 
 12-31=2013-03-19 moms
 	liabilities:tax
-	liabilities:tax:sales     37125
-	liabilities:tax:expenses  -1473
+	liabilities:tax:sales     36451
+	liabilities:tax:expenses  -1474
diff --git a/data/2012/income/db.ledger b/data/2012/income/db.ledger
index 4e92c9a..42e8b77 100644
--- a/data/2012/income/db.ledger
+++ b/data/2012/income/db.ledger
@@ -28,7 +28,7 @@
 	income:sales:backup   -1000; Fjernbackup, juli - august: 2 mdr. á 500,-
 	liabilities:tax:sales  -2500
 
-11-05=11-13 012028; Vedr. Redpill - bæredygtig it-drift
+11-05=2013-01-03 012028; Vedr. Redpill - bæredygtig it-drift
 	assets:receivable:db
 	income:sales:redpill  -9000; Redpill, september - oktober: 2 mdr. á 10.000,- med 55% rabat
 	income:sales:backup   -1000; Fjernbackup, september - oktober: 2 mdr. á 500,-
@@ -40,7 +40,7 @@
 	income:sales:backup    -500; Fjernbackup, november: 1 md. á 500,-
 	liabilities:tax:sales  -1250
 
-12-31=2013-02-26 012040; Vedr. Redpill - bæredygtig it-drift
+12-31=2013-04-03 012040; Vedr. Redpill - bæredygtig it-drift
 	assets:receivable:db
 	income:sales:redpill  -4500; Redpill, december: 1 md. á 10.000,- med 55% rabat
 	income:sales:backup    -500; Fjernbackup, december: 1 md. á 500,-