Restructure receipts/{receipt}.ledger → {year}/expenses/{supplier}.ledger.

38 files changed, 157 insertions, 131 deletions

diff --git a/bin/myhledger b/bin/myhledger
index f35601e..cd3a219 100755
--- a/bin/myhledger
+++ b/bin/myhledger
@@ -21,9 +21,9 @@ journal() {
 	for year in $years; do
 		cat $year/*.ledger 2> /dev/null || true
 		cat $year/income/*.ledger 2> /dev/null || true
+		cat $year/expenses/*.ledger 2> /dev/null || true
 	done
 	cat ../bank/*.ledger 2> /dev/null || true
-	cat ../receipts/*.ledger 2> /dev/null || true
 	cat ../taxes/*.ledger 2> /dev/null || true
 }
 
diff --git a/data/2012/expenses/dkhm.ledger b/data/2012/expenses/dkhm.ledger
new file mode 100644
index 0000000..fc68af6
--- /dev/null
+++ b/data/2012/expenses/dkhm.ledger
@@ -0,0 +1,19 @@
+01-01 dkhm 3090586
+	liabilities:payable
+	expenses:internet     72
+	tax:expenses          18
+
+03-01 dkhm 3207006
+	liabilities:payable
+	expenses:internet     72
+	tax:expenses          18
+
+09-02 dkhm 3573725
+	liabilities:payable
+	expenses:internet     144
+	tax:expenses           36
+
+12-01 dkhm 3726884
+	liabilities:payable
+	expenses:internet     36
+	tax:expenses           9
diff --git a/data/2012/expenses/misc.ledger b/data/2012/expenses/misc.ledger
new file mode 100644
index 0000000..5d930d6
--- /dev/null
+++ b/data/2012/expenses/misc.ledger
@@ -0,0 +1,18 @@
+07-04 teleway 300415
+	liabilities:payable
+	expenses:hardware      87,20
+	expenses:delivery      30
+	tax:expenses           21,80
+
+08-12 unot 908792183
+	liabilities:payable
+	expenses:hardware     4395,20
+	expenses:delivery      138
+	tax:expenses          1108,30
+
+10-10 elav 81199
+	liabilities:payable
+	expenses:hardware      126,40
+	expenses:delivery       69
+	expenses:non-vat:fees    1,68
+	tax:expenses            31,60
diff --git a/data/2012/expenses/persp.ledger b/data/2012/expenses/persp.ledger
new file mode 100644
index 0000000..b5daf20
--- /dev/null
+++ b/data/2012/expenses/persp.ledger
@@ -0,0 +1,45 @@
+01-17 persp 6189594574035; Girocode: +71< 000002038527715+0081354804<
+	liabilities:payable
+	expenses:internet     214,40
+	expenses:non-vat      200
+	tax:expenses           53,60
+	; Payment-Date: 2012-02-29
+
+02-16 persp 6274304574036; Girocode: +71< 000002038697427+0081354804<
+	liabilities:payable
+	expenses:internet     214,40
+	expenses:non-vat      100
+	tax:expenses           53,60
+	; Payment-Date: 2012-02-29
+
+03-16 persp 6357264574037; Girocode: +71< 000002058527728+0081354804<
+	liabilities:payable
+	expenses:internet     214,40
+	tax:expenses           53,60
+	; Payment-Date: 2012-03-27
+
+04-01 persp
+	liabilities:payable
+	expenses:internet     214,40
+	expenses:non-vat      100
+	tax:expenses           53,60
+	; Payment-Date: 2012-02-29
+
+04-13 persp 6442114574039
+	liabilities:payable
+	expenses:internet     214,40
+	tax:expenses           53,60
+
+05-21 persp 6529414574030; Girocode: +71< 000002119811459+0081354804<
+	liabilities:payable
+	expenses:internet     214,40
+	expenses:non-vat      100
+	tax:expenses           53,60
+	; Payment-Date: 2012-07-11
+
+06-14 persp 6609354574032; Girocode: +71< 000002116670130+0081354804<
+	liabilities:payable
+	expenses:internet     214,40
+	expenses:non-vat      100
+	tax:expenses           53,60
+	; Payment-Date: 2012-07-11
diff --git a/data/2012/expenses/unotel.ledger b/data/2012/expenses/unotel.ledger
new file mode 100644
index 0000000..7d191cb
--- /dev/null
+++ b/data/2012/expenses/unotel.ledger
@@ -0,0 +1,74 @@
+01-15 Unotel 3301553
+	liabilities:payable
+	expenses:non-vat:phone  207,81
+
+03-05 Unotel 3332182
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-25 Unotel 3356258
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-26 Unotel 3356564
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-26 Unotel 3356588
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-26 Unotel 3356597
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-26 Unotel 3356606
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-26 Unotel 3356364
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-27 Unotel 3356675
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-27 Unotel 3356695
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-27 Unotel 3356899
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+04-27 Unotel 3356662
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+06-19 unot 3388522
+	liabilities:payable
+	expenses:internet     485,60
+	tax:expenses          121,40
+
+07-18 Unotel 25334272
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+09-19 unot 3455943
+	liabilities:payable
+	expenses:internet     542,14
+	tax:expenses          135,54
+
+11-12 Unotel 25334272
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+12-10 Unotel 25334272
+	liabilities:payable
+	expenses:non-vat:phone  201,65
+
+12-16 unot 3513648
+	liabilities:payable
+	expenses:internet     525,60
+	tax:expenses          131,40
diff --git a/receipts/20120000.ledger b/receipts/20120000.ledger
deleted file mode 100644
index da90516..0000000
--- a/receipts/20120000.ledger
+++ /dev/null
@@ -1 +0,0 @@
-Y2012
diff --git a/receipts/20120101-dkhm.ledger b/receipts/20120101-dkhm.ledger
deleted file mode 100644
index ab8ad15..0000000
--- a/receipts/20120101-dkhm.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-01-01 dkhm 3090586
-	liabilities:payable
-	expenses:internet		72
-	tax:expenses			18
diff --git a/receipts/20120115-unotel.ledger b/receipts/20120115-unotel.ledger
deleted file mode 100644
index f3d2c4b..0000000
--- a/receipts/20120115-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-01-15 Unotel 3301553
-	liabilities:payable
-	expenses:non-vat:phone		207.81
diff --git a/receipts/20120117-persp.ledger b/receipts/20120117-persp.ledger
deleted file mode 100644
index 291b180..0000000
--- a/receipts/20120117-persp.ledger
+++ /dev/null
@@ -1,6 +0,0 @@
-01-17 persp 6189594574035; Girocode: +71< 000002038527715+0081354804<
-	liabilities:payable
-	expenses:internet		214,40
-	expenses:non-vat		200
-	tax:expenses			53,60
-	; Payment-Date: 2012-02-29
diff --git a/receipts/20120216-persp.ledger b/receipts/20120216-persp.ledger
deleted file mode 100644
index 6e9bec8..0000000
--- a/receipts/20120216-persp.ledger
+++ /dev/null
@@ -1,6 +0,0 @@
-02-16 persp 6274304574036; Girocode: +71< 000002038697427+0081354804<
-	liabilities:payable
-	expenses:internet		214,40
-	expenses:non-vat		100
-	tax:expenses			53,60
-	; Payment-Date: 2012-02-29
diff --git a/receipts/20120301-dkhm.ledger b/receipts/20120301-dkhm.ledger
deleted file mode 100644
index bce000e..0000000
--- a/receipts/20120301-dkhm.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-03-01 dkhm 3207006
-	liabilities:payable
-	expenses:internet		72
-	tax:expenses			18
diff --git a/receipts/20120305-unotel.ledger b/receipts/20120305-unotel.ledger
deleted file mode 100644
index d2f3eec..0000000
--- a/receipts/20120305-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-03-05 Unotel 3332182
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120316-persp.ledger b/receipts/20120316-persp.ledger
deleted file mode 100644
index 8cc2223..0000000
--- a/receipts/20120316-persp.ledger
+++ /dev/null
@@ -1,5 +0,0 @@
-03-16 persp 6357264574037; Girocode: +71< 000002058527728+0081354804<
-	liabilities:payable
-	expenses:internet		214,40
-	tax:expenses			53,60
-	; Payment-Date: 2012-03-27
diff --git a/receipts/20120400-persp.ledger b/receipts/20120400-persp.ledger
deleted file mode 100644
index 98aba7a..0000000
--- a/receipts/20120400-persp.ledger
+++ /dev/null
@@ -1,7 +0,0 @@
-04-01 persp
-	liabilities:payable
-	expenses:internet		214,40
-	expenses:non-vat		100
-	tax:expenses			53,60
-	; Payment-Date: 2012-02-29
-; paid before billed?
diff --git a/receipts/20120413-persp.ledger b/receipts/20120413-persp.ledger
deleted file mode 100644
index 894493b..0000000
--- a/receipts/20120413-persp.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-04-13 persp 6442114574039
-	liabilities:payable
-	expenses:internet		214,40
-	tax:expenses			53,60
diff --git a/receipts/20120425-unotel.ledger b/receipts/20120425-unotel.ledger
deleted file mode 100644
index a2143b0..0000000
--- a/receipts/20120425-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-25 Unotel 3356258
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120426-unotel.ledger b/receipts/20120426-unotel.ledger
deleted file mode 100644
index 66efc3c..0000000
--- a/receipts/20120426-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-26 Unotel 3356364
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120426a-unotel.ledger b/receipts/20120426a-unotel.ledger
deleted file mode 100644
index 243d963..0000000
--- a/receipts/20120426a-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-26 Unotel 3356564
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120426b-unotel.ledger b/receipts/20120426b-unotel.ledger
deleted file mode 100644
index df373ac..0000000
--- a/receipts/20120426b-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-26 Unotel 3356588
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120426c-unotel.ledger b/receipts/20120426c-unotel.ledger
deleted file mode 100644
index a15bcbd..0000000
--- a/receipts/20120426c-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-26 Unotel 3356597
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120426d-unotel.ledger b/receipts/20120426d-unotel.ledger
deleted file mode 100644
index 4c7e7c8..0000000
--- a/receipts/20120426d-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-26 Unotel 3356606
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120427-unotel.ledger b/receipts/20120427-unotel.ledger
deleted file mode 100644
index db036ee..0000000
--- a/receipts/20120427-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-27 Unotel 3356662
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120427a-unotel.ledger b/receipts/20120427a-unotel.ledger
deleted file mode 100644
index 4899a23..0000000
--- a/receipts/20120427a-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-27 Unotel 3356675
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120427b-unotel.ledger b/receipts/20120427b-unotel.ledger
deleted file mode 100644
index 68db84f..0000000
--- a/receipts/20120427b-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-27 Unotel 3356695
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120427c-unotel.ledger b/receipts/20120427c-unotel.ledger
deleted file mode 100644
index d0ad7d1..0000000
--- a/receipts/20120427c-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-04-27 Unotel 3356899
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120521-persp.ledger b/receipts/20120521-persp.ledger
deleted file mode 100644
index 2684f77..0000000
--- a/receipts/20120521-persp.ledger
+++ /dev/null
@@ -1,6 +0,0 @@
-05-21 persp 6529414574030; Girocode: +71< 000002119811459+0081354804<
-	liabilities:payable
-	expenses:internet		214,40
-	expenses:non-vat		100
-	tax:expenses			53,60
-	; Payment-Date: 2012-07-11
diff --git a/receipts/20120614-persp.ledger b/receipts/20120614-persp.ledger
deleted file mode 100644
index 9a3e8d2..0000000
--- a/receipts/20120614-persp.ledger
+++ /dev/null
@@ -1,6 +0,0 @@
-06-14 persp 6609354574032; Girocode: +71< 000002116670130+0081354804<
-	liabilities:payable
-	expenses:internet		214,40
-	expenses:non-vat		100
-	tax:expenses			53,60
-	; Payment-Date: 2012-07-11
diff --git a/receipts/20120619-unotel.ledger b/receipts/20120619-unotel.ledger
deleted file mode 100644
index 63c2941..0000000
--- a/receipts/20120619-unotel.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-06-19 unot 3388522
-	liabilities:payable
-	expenses:internet		485,60
-	tax:expenses			121,40
diff --git a/receipts/20120704-teleway.ledger b/receipts/20120704-teleway.ledger
deleted file mode 100644
index e31345f..0000000
--- a/receipts/20120704-teleway.ledger
+++ /dev/null
@@ -1,5 +0,0 @@
-07-04 teleway 300415
-	liabilities:payable
-	expenses:hardware		87,20
-	expenses:delivery		30
-	tax:expenses			21,80
diff --git a/receipts/20120718-unotel.ledger b/receipts/20120718-unotel.ledger
deleted file mode 100644
index 6defaa2..0000000
--- a/receipts/20120718-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-07-18 Unotel 25334272
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20120812-komplett.ledger b/receipts/20120812-komplett.ledger
deleted file mode 100644
index cc41693..0000000
--- a/receipts/20120812-komplett.ledger
+++ /dev/null
@@ -1,5 +0,0 @@
-08-12 unot 908792183
-	liabilities:payable
-	expenses:hardware		4395,20
-	expenses:delivery		138
-	tax:expenses			1108,30
diff --git a/receipts/20120902-dkhm.ledger b/receipts/20120902-dkhm.ledger
deleted file mode 100644
index 2ec0f25..0000000
--- a/receipts/20120902-dkhm.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-09-02 dkhm 3573725
-	liabilities:payable
-	expenses:internet		144
-	tax:expenses			36
diff --git a/receipts/20120919-unotel.ledger b/receipts/20120919-unotel.ledger
deleted file mode 100644
index fa7a00f..0000000
--- a/receipts/20120919-unotel.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-09-19 unot 3455943
-	liabilities:payable
-	expenses:internet		542,14
-	tax:expenses			135,54
diff --git a/receipts/20121010-elav.ledger b/receipts/20121010-elav.ledger
deleted file mode 100644
index 359794d..0000000
--- a/receipts/20121010-elav.ledger
+++ /dev/null
@@ -1,6 +0,0 @@
-10-10 elav 81199
-	liabilities:payable
-	expenses:hardware		126,40
-	expenses:delivery		69
-	expenses:non-vat:fees		1,68
-	tax:expenses			31,60
diff --git a/receipts/20121112-unotel.ledger b/receipts/20121112-unotel.ledger
deleted file mode 100644
index 0af3402..0000000
--- a/receipts/20121112-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-11-12 Unotel 25334272
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20121201-dkhm.ledger b/receipts/20121201-dkhm.ledger
deleted file mode 100644
index 1515650..0000000
--- a/receipts/20121201-dkhm.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-12-01 dkhm 3726884
-	liabilities:payable
-	expenses:internet		36
-	tax:expenses			9
diff --git a/receipts/20121210-unotel.ledger b/receipts/20121210-unotel.ledger
deleted file mode 100644
index e9f6fe5..0000000
--- a/receipts/20121210-unotel.ledger
+++ /dev/null
@@ -1,3 +0,0 @@
-12-10 Unotel 25334272
-	liabilities:payable
-	expenses:non-vat:phone		201.65
diff --git a/receipts/20121216-unotel.ledger b/receipts/20121216-unotel.ledger
deleted file mode 100644
index 7fc0b2f..0000000
--- a/receipts/20121216-unotel.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-12-16 unot 3513648
-	liabilities:payable
-	expenses:internet		525,60
-	tax:expenses			131,40