Restructure taxes/{period}.ledger → {year}/expenses/vat.ledger.

42 files changed, 87 insertions, 81 deletions

diff --git a/bin/myhledger b/bin/myhledger
index d2cdac6..ea9366c 100755
--- a/bin/myhledger
+++ b/bin/myhledger
@@ -24,7 +24,6 @@ journal() {
 		cat $year/income/*.ledger 2> /dev/null || true
 		cat $year/expenses/*.ledger 2> /dev/null || true
 	done
-	cat ../taxes/*.ledger 2> /dev/null || true
 }
 
 journal | hledger -f- "$@"
diff --git a/data/2001/0.ledger b/data/2001/0.ledger
new file mode 100644
index 0000000..190a685
--- /dev/null
+++ b/data/2001/0.ledger
@@ -0,0 +1 @@
+Y2001
diff --git a/data/2001/expenses/vat.ledger b/data/2001/expenses/vat.ledger
new file mode 100644
index 0000000..4d8ee5d
--- /dev/null
+++ b/data/2001/expenses/vat.ledger
@@ -0,0 +1,4 @@
+06-30 moms
+	liabilities:tax
+	tax:sales         0
+	tax:expenses  -7400
diff --git a/taxes/20010000.ledger b/data/2003/0.ledger
index dfd949f..dfd949f 100644
--- a/taxes/20010000.ledger
+++ b/data/2003/0.ledger
diff --git a/data/2003/expenses/vat.ledger b/data/2003/expenses/vat.ledger
new file mode 100644
index 0000000..5891fa0
--- /dev/null
+++ b/data/2003/expenses/vat.ledger
@@ -0,0 +1,9 @@
+06-30 moms
+	liabilities:tax
+	tax:sales      2380
+	tax:expenses  -1237
+
+12-31 moms
+	liabilities:tax
+	tax:sales      1425
+	tax:expenses  -1779
diff --git a/taxes/20050000.ledger b/data/2005/0.ledger
index e2749ad..e2749ad 100644
--- a/taxes/20050000.ledger
+++ b/data/2005/0.ledger
diff --git a/data/2005/expenses/vat.ledger b/data/2005/expenses/vat.ledger
new file mode 100644
index 0000000..32b2cf3
--- /dev/null
+++ b/data/2005/expenses/vat.ledger
@@ -0,0 +1,9 @@
+12-21=06-30 moms
+	liabilities:tax
+	tax:sales     18825
+	tax:expenses  -3820
+
+2006-05-12=2005-12-31 moms
+	liabilities:tax
+	tax:sales     43694
+	tax:expenses  -2618
diff --git a/taxes/20060000.ledger b/data/2006/0.ledger
index 6869702..6869702 100644
--- a/taxes/20060000.ledger
+++ b/data/2006/0.ledger
diff --git a/data/2006/expenses/vat.ledger b/data/2006/expenses/vat.ledger
new file mode 100644
index 0000000..3973dad
--- /dev/null
+++ b/data/2006/expenses/vat.ledger
@@ -0,0 +1,10 @@
+08-31=06-30 moms
+	liabilities:tax
+	tax:sales            18898
+	tax:expenses         -3428
+	tax:eu:sales:no-tax  50000
+
+2007-03-02=2006-12-31 moms
+	liabilities:tax
+	tax:sales     34550
+	tax:expenses     -0
diff --git a/taxes/20070000.ledger b/data/2007/0.ledger
index bd9aa36..bd9aa36 100644
--- a/taxes/20070000.ledger
+++ b/data/2007/0.ledger
diff --git a/data/2007/expenses/vat.ledger b/data/2007/expenses/vat.ledger
new file mode 100644
index 0000000..2075670
--- /dev/null
+++ b/data/2007/expenses/vat.ledger
@@ -0,0 +1,9 @@
+10-22=06-30 moms
+	liabilities:tax
+	tax:sales     25730
+	tax:expenses     -0
+
+2008-03-05=2007-12-31 moms
+	liabilities:tax
+	tax:sales     27401
+	tax:expenses     -0
diff --git a/taxes/20080000.ledger b/data/2008/0.ledger
index 9142b55..9142b55 100644
--- a/taxes/20080000.ledger
+++ b/data/2008/0.ledger
diff --git a/data/2008/expenses/vat.ledger b/data/2008/expenses/vat.ledger
new file mode 100644
index 0000000..8f87fc9
--- /dev/null
+++ b/data/2008/expenses/vat.ledger
@@ -0,0 +1,4 @@
+08-13=06-30 moms
+	liabilities:tax
+	tax:sales     18652
+	tax:expenses     -0
diff --git a/taxes/20090000.ledger b/data/2009/0.ledger
index 3b55326..3b55326 100644
--- a/taxes/20090000.ledger
+++ b/data/2009/0.ledger
diff --git a/data/2009/expenses/vat.ledger b/data/2009/expenses/vat.ledger
new file mode 100644
index 0000000..b9f601e
--- /dev/null
+++ b/data/2009/expenses/vat.ledger
@@ -0,0 +1,9 @@
+2010-04-27=2009-06-30 moms
+	liabilities:tax
+	tax:sales     43250
+	tax:expenses  -4778
+
+2010-04-27=2009-12-31 moms
+	liabilities:tax
+	tax:sales     46181
+	tax:expenses  -2425
diff --git a/taxes/20100000.ledger b/data/2010/0.ledger
index 71ca120..71ca120 100644
--- a/taxes/20100000.ledger
+++ b/data/2010/0.ledger
diff --git a/data/2010/expenses/vat.ledger b/data/2010/expenses/vat.ledger
new file mode 100644
index 0000000..791d45f
--- /dev/null
+++ b/data/2010/expenses/vat.ledger
@@ -0,0 +1,10 @@
+01-11=06-30 moms
+	liabilities:tax
+	tax:sales     33625
+	tax:expenses  -1965
+
+2011-03-03=2010-12-31 moms
+	liabilities:tax
+	tax:sales           33125
+	tax:expenses         -791
+	tax:eu:sales:brutto  5536
diff --git a/taxes/20110000.ledger b/data/2011/0.ledger
index 017bfd9..017bfd9 100644
--- a/taxes/20110000.ledger
+++ b/data/2011/0.ledger
diff --git a/data/2011/expenses/vat.ledger b/data/2011/expenses/vat.ledger
new file mode 100644
index 0000000..522b09b
--- /dev/null
+++ b/data/2011/expenses/vat.ledger
@@ -0,0 +1,9 @@
+09-05=06-30 moms
+	liabilities:tax
+	tax:sales     41600
+	tax:expenses   -888
+
+2012-07-09=2011-12-31 moms
+	liabilities:tax
+	tax:sales     34000
+	tax:expenses   -443
diff --git a/data/2012/expenses/vat.ledger b/data/2012/expenses/vat.ledger
new file mode 100644
index 0000000..aac6cbc
--- /dev/null
+++ b/data/2012/expenses/vat.ledger
@@ -0,0 +1,9 @@
+09-20=06-30 moms
+	liabilities:tax
+	tax:sales     35250
+	tax:expenses   -586
+
+2013-03-19=2012-12-31 moms
+	liabilities:tax
+	tax:sales     37125
+	tax:expenses  -1473
diff --git a/data/2013/expenses/vat.ledger b/data/2013/expenses/vat.ledger
new file mode 100644
index 0000000..7b07bfd
--- /dev/null
+++ b/data/2013/expenses/vat.ledger
@@ -0,0 +1,4 @@
+09-09=06-30 moms
+	liabilities:tax
+	tax:sales     27625
+	tax:expenses     -0
diff --git a/taxes/20010630-skat.ledger b/taxes/20010630-skat.ledger
deleted file mode 100644
index a70b451..0000000
--- a/taxes/20010630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-06-30 moms
-	liabilities:tax
-	tax:sales		0
-	tax:expenses		-7400
diff --git a/taxes/20030000.ledger b/taxes/20030000.ledger
deleted file mode 100644
index dfd949f..0000000
--- a/taxes/20030000.ledger
+++ /dev/null
@@ -1 +0,0 @@
-Y2003
diff --git a/taxes/20030630-skat.ledger b/taxes/20030630-skat.ledger
deleted file mode 100644
index c6c0b56..0000000
--- a/taxes/20030630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-06-30 moms
-	liabilities:tax
-	tax:sales		2380
-	tax:expenses		-1237
diff --git a/taxes/20031231-skat.ledger b/taxes/20031231-skat.ledger
deleted file mode 100644
index 8d73433..0000000
--- a/taxes/20031231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2003-12-31 moms
-	liabilities:tax
-	tax:sales		1425
-	tax:expenses		-1779
diff --git a/taxes/20050630-skat.ledger b/taxes/20050630-skat.ledger
deleted file mode 100644
index 8836c6e..0000000
--- a/taxes/20050630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-12-21=06-30 moms
-	liabilities:tax
-	tax:sales		18825
-	tax:expenses		-3820
diff --git a/taxes/20051231-skat.ledger b/taxes/20051231-skat.ledger
deleted file mode 100644
index 8796e87..0000000
--- a/taxes/20051231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-05-12=2005-12-31 moms
-	liabilities:tax
-	tax:sales		43694
-	tax:expenses		-2618
diff --git a/taxes/20060630-skat.ledger b/taxes/20060630-skat.ledger
deleted file mode 100644
index d2793df..0000000
--- a/taxes/20060630-skat.ledger
+++ /dev/null
@@ -1,5 +0,0 @@
-08-31=06-30 moms
-	liabilities:tax
-	tax:sales			18898
-	tax:expenses			-3428
-	tax:eu:sales:no-tax		50000
diff --git a/taxes/20061231-skat.ledger b/taxes/20061231-skat.ledger
deleted file mode 100644
index 00b45fb..0000000
--- a/taxes/20061231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2007-03-02=2006-12-31 moms
-	liabilities:tax
-	tax:sales		34550
-	tax:expenses		-0
diff --git a/taxes/20070630-skat.ledger b/taxes/20070630-skat.ledger
deleted file mode 100644
index d28b030..0000000
--- a/taxes/20070630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-10-22=06-30 moms
-	liabilities:tax
-	tax:sales		25730
-	tax:expenses		-0
diff --git a/taxes/20071231-skat.ledger b/taxes/20071231-skat.ledger
deleted file mode 100644
index 2da447d..0000000
--- a/taxes/20071231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2008-03-05=2007-12-31 moms
-	liabilities:tax
-	tax:sales		27401
-	tax:expenses		-0
diff --git a/taxes/20080630-skat.ledger b/taxes/20080630-skat.ledger
deleted file mode 100644
index d5e2cc7..0000000
--- a/taxes/20080630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-08-13=06-30 moms
-	liabilities:tax
-	tax:sales		18652
-	tax:expenses		-0
diff --git a/taxes/20090630-skat.ledger b/taxes/20090630-skat.ledger
deleted file mode 100644
index c8bce4c..0000000
--- a/taxes/20090630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-04-27=2009-06-30 moms
-	liabilities:tax
-	tax:sales		43250
-	tax:expenses		-4778
diff --git a/taxes/20091231-skat.ledger b/taxes/20091231-skat.ledger
deleted file mode 100644
index 9bc8274..0000000
--- a/taxes/20091231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-04-27=2009-12-31 moms
-	liabilities:tax
-	tax:sales		46181
-	tax:expenses		-2425
diff --git a/taxes/20100630-skat.ledger b/taxes/20100630-skat.ledger
deleted file mode 100644
index 443dce6..0000000
--- a/taxes/20100630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-01-11=06-30 moms
-	liabilities:tax
-	tax:sales		33625
-	tax:expenses		-1965
diff --git a/taxes/20101231-skat.ledger b/taxes/20101231-skat.ledger
deleted file mode 100644
index 6ab4867..0000000
--- a/taxes/20101231-skat.ledger
+++ /dev/null
@@ -1,5 +0,0 @@
-2011-03-03=2010-12-31 moms
-	liabilities:tax
-	tax:sales			33125
-	tax:expenses			-791
-	tax:eu:sales:brutto		5536
diff --git a/taxes/20110630-skat.ledger b/taxes/20110630-skat.ledger
deleted file mode 100644
index 87d00bc..0000000
--- a/taxes/20110630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-09-05=06-30 moms
-	liabilities:tax
-	tax:sales		41600
-	tax:expenses		-888
diff --git a/taxes/20111231-skat.ledger b/taxes/20111231-skat.ledger
deleted file mode 100644
index f21b669..0000000
--- a/taxes/20111231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2012-07-09=2011-12-31 moms
-	liabilities:tax
-	tax:sales		34000
-	tax:expenses		-443
diff --git a/taxes/20120000.ledger b/taxes/20120000.ledger
deleted file mode 100644
index da90516..0000000
--- a/taxes/20120000.ledger
+++ /dev/null
@@ -1 +0,0 @@
-Y2012
diff --git a/taxes/20120630-skat.ledger b/taxes/20120630-skat.ledger
deleted file mode 100644
index e23129b..0000000
--- a/taxes/20120630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-09-20=06-30 moms
-	liabilities:tax
-	tax:sales		35250
-	tax:expenses		-586
diff --git a/taxes/20121231-skat.ledger b/taxes/20121231-skat.ledger
deleted file mode 100644
index 592c4bb..0000000
--- a/taxes/20121231-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2013-03-19=2012-12-31 moms
-	liabilities:tax
-	tax:sales		37125
-	tax:expenses		-1473
diff --git a/taxes/20130630-skat.ledger b/taxes/20130630-skat.ledger
deleted file mode 100644
index cda5557..0000000
--- a/taxes/20130630-skat.ledger
+++ /dev/null
@@ -1,4 +0,0 @@
-2013-09-09=2013-06-30 moms
-	liabilities:tax
-	tax:sales		27625
-	tax:expenses		-0