Restructure bank/{account}-{year}.* → {year}/assets/{account}.*.

25 files changed, 5 insertions, 8 deletions

diff --git a/bank/0.ledger b/bank/0.ledger
deleted file mode 100644
index b481a01..0000000
--- a/bank/0.ledger
+++ /dev/null
@@ -1 +0,0 @@
-D 1.000,00 kr
diff --git a/bank/84011036781-2010.csv b/bank/84011036781-2010.csv
deleted file mode 100644
index 5383ba2..0000000
--- a/bank/84011036781-2010.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Dato";"Tekst";"Beløb";"Saldo";"Valørdato";"Type";"Adviseringer";
-16-03-2010;"Ovf. 84010001028184";-111.67; 0.00;"16-03-2010";
-26-05-2010;"PROJEKT SØLYSTGADE"; 100.00; 100.00;"26-05-2010";"OVF.";"MARIA FOGED OLESEN REGENBURGSGADE 8, 1 TV 8000  ÅRHUS C ";
-20-08-2010;"INGER SMEDEGÅRD J. G"; 1700.00; 1800.00;"20-08-2010";"OVF.";"INGER SMEDEGÅRD J. GRAVERSEN SKJERNÅVEJ 8, LØNBORG 6880 TARM ";"raversen ";
-02-09-2010;"Ovf. inger fleece";-1700.00; 100.00;"02-09-2010";
diff --git a/bin/myhledger b/bin/myhledger
index cd3a219..d2cdac6 100755
--- a/bin/myhledger
+++ b/bin/myhledger
@@ -20,10 +20,10 @@ journal() {
 	cat *.ledger 2> /dev/null || true
 	for year in $years; do
 		cat $year/*.ledger 2> /dev/null || true
+		cat $year/assets/*.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 ../taxes/*.ledger 2> /dev/null || true
 }
 
diff --git a/bin/mymerkur2ledger b/bin/mymerkur2ledger
index 429f40f..e047935 100755
--- a/bin/mymerkur2ledger
+++ b/bin/mymerkur2ledger
@@ -1,4 +1,7 @@
 #!/bin/sh
 
+rulesfile="$1"
+shift
+
 csvtool -t ";" -u COMMA square "$@" \
-	| hledger print --rules-file merkur.rules -f-
+	| hledger print ${rulesfile:+--rules-file "$rulesfile"} -f-
diff --git a/bank/84011508060-20091231.csv b/data-couch/2009/assets/84011508060.csv
index 84bfd8c..84bfd8c 100644
--- a/bank/84011508060-20091231.csv
+++ b/data-couch/2009/assets/84011508060.csv
diff --git a/bank/84011508060-2010.csv b/data-couch/2010/assets/84011508060.csv
index f2ac775..f2ac775 100644
--- a/bank/84011508060-2010.csv
+++ b/data-couch/2010/assets/84011508060.csv
diff --git a/bank/84011508060-2011.csv b/data-couch/2011/assets/84011508060.csv
index d929732..d929732 100644
--- a/bank/84011508060-2011.csv
+++ b/data-couch/2011/assets/84011508060.csv
diff --git a/bank/84011508060-2012.csv b/data-couch/2012/assets/84011508060.csv
index 82eb29c..82eb29c 100644
--- a/bank/84011508060-2012.csv
+++ b/data-couch/2012/assets/84011508060.csv
diff --git a/bank/84011508060-2013.csv b/data-couch/2013/assets/84011508060.csv
index 38aa0b4..38aa0b4 100644
--- a/bank/84011508060-2013.csv
+++ b/data-couch/2013/assets/84011508060.csv
diff --git a/bank/84011028184-20091231.csv b/data-private/2009/assets/84011028184.csv
index cf0c68a..cf0c68a 100644
--- a/bank/84011028184-20091231.csv
+++ b/data-private/2009/assets/84011028184.csv
diff --git a/bank/84011028184-2010.csv b/data-private/2010/assets/84011028184.csv
index 800807f..800807f 100644
--- a/bank/84011028184-2010.csv
+++ b/data-private/2010/assets/84011028184.csv
diff --git a/bank/84011028184-2011.csv b/data-private/2011/assets/84011028184.csv
index 4f12402..4f12402 100644
--- a/bank/84011028184-2011.csv
+++ b/data-private/2011/assets/84011028184.csv
diff --git a/bank/84011028184-2012.csv b/data-private/2012/assets/84011028184.csv
index 34fd8d7..34fd8d7 100644
--- a/bank/84011028184-2012.csv
+++ b/data-private/2012/assets/84011028184.csv
diff --git a/bank/84011028184-2013.csv b/data-private/2013/assets/84011028184.csv
index f38d0da..f38d0da 100644
--- a/bank/84011028184-2013.csv
+++ b/data-private/2013/assets/84011028184.csv
diff --git a/bank/84011036773-20081231.csv b/data/2008/assets/84011036773.csv
index 232d630..232d630 100644
--- a/bank/84011036773-20081231.csv
+++ b/data/2008/assets/84011036773.csv
diff --git a/bank/84011036773-2009.csv b/data/2009/assets/84011036773.csv
index 0579d01..0579d01 100644
--- a/bank/84011036773-2009.csv
+++ b/data/2009/assets/84011036773.csv
diff --git a/bank/84011036773-2009.ledger b/data/2009/assets/84011036773.ledger
index c5d7c41..c5d7c41 100644
--- a/bank/84011036773-2009.ledger
+++ b/data/2009/assets/84011036773.ledger
diff --git a/bank/84011036773-2010.csv b/data/2010/assets/84011036773.csv
index b0315e7..b0315e7 100644
--- a/bank/84011036773-2010.csv
+++ b/data/2010/assets/84011036773.csv
diff --git a/bank/84011036773-2010.ledger b/data/2010/assets/84011036773.ledger
index 24198f4..24198f4 100644
--- a/bank/84011036773-2010.ledger
+++ b/data/2010/assets/84011036773.ledger
diff --git a/bank/84011036773-2011.csv b/data/2011/assets/84011036773.csv
index 43cc309..43cc309 100644
--- a/bank/84011036773-2011.csv
+++ b/data/2011/assets/84011036773.csv
diff --git a/bank/84011036773-2011.ledger b/data/2011/assets/84011036773.ledger
index d824b8d..d824b8d 100644
--- a/bank/84011036773-2011.ledger
+++ b/data/2011/assets/84011036773.ledger
diff --git a/bank/84011036773-2012.csv b/data/2012/assets/84011036773.csv
index d2f2560..d2f2560 100644
--- a/bank/84011036773-2012.csv
+++ b/data/2012/assets/84011036773.csv
diff --git a/bank/84011036773-2012.ledger b/data/2012/assets/84011036773.ledger
index b3cfe71..b3cfe71 100644
--- a/bank/84011036773-2012.ledger
+++ b/data/2012/assets/84011036773.ledger
diff --git a/bank/84011036773-2013.csv b/data/2013/assets/84011036773.csv
index ab8a668..ab8a668 100644
--- a/bank/84011036773-2013.csv
+++ b/data/2013/assets/84011036773.csv
diff --git a/bank/merkur.rules b/data/merkur.rules
index a0cd743..a0cd743 100644
--- a/bank/merkur.rules
+++ b/data/merkur.rules