From a6799b56003a4463acca16e8fe297be5eb19cd2c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 19 Feb 2015 13:22:38 +0100 Subject: Fix complete and adjust ehj payments. --- data/2012/assets/84011036773.csv.local.rules | 5 +++++ data/2012/income/ehj.ledger | 17 +++++++++++++++ data/2013/assets/84011036773.csv.local.rules | 15 ++++++++++++++ data/2013/income/ehj.ledger | 31 +++++++++++++++------------- data/2014/assets/84011036773.csv.local.rules | 11 ++++++++++ data/2014/income/ehj.ledger | 23 ++++++++++++--------- 6 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 data/2012/assets/84011036773.csv.local.rules create mode 100644 data/2012/income/ehj.ledger diff --git a/data/2012/assets/84011036773.csv.local.rules b/data/2012/assets/84011036773.csv.local.rules new file mode 100644 index 0000000..c63a359 --- /dev/null +++ b/data/2012/assets/84011036773.csv.local.rules @@ -0,0 +1,5 @@ +if +8401103M22780027 +8401103M23070031 +8401103M23380025 + account2 assets:receivable:ehj diff --git a/data/2012/income/ehj.ledger b/data/2012/income/ehj.ledger new file mode 100644 index 0000000..1fd0333 --- /dev/null +++ b/data/2012/income/ehj.ledger @@ -0,0 +1,17 @@ +10-04=10-05 012910 + assets:receivable:ehj 267,82 + income:sales:redpill + liabilities:tax:sales -67 + expenses:non-vat:bank:fees -30 + +11-02 012911 + assets:receivable:ehj 267,98 + income:sales:redpill + liabilities:tax:sales -67 + expenses:non-vat:bank:fees -30 + +12-03=12-04 012912 + assets:receivable:ehj 268,01 + income:sales:redpill + liabilities:tax:sales -67 + expenses:non-vat:bank:fees -30 diff --git a/data/2013/assets/84011036773.csv.local.rules b/data/2013/assets/84011036773.csv.local.rules index 6d4c5a8..779bddc 100644 --- a/data/2013/assets/84011036773.csv.local.rules +++ b/data/2013/assets/84011036773.csv.local.rules @@ -1,6 +1,21 @@ if DK-NOTA914 TELEPART.DK account2 assets:advances:ehj +if +8401103M30020023 +8401103M30350035 +8401103M30630028 +8401103M30920042 +8401103M31220030 +8401103M31540050 +8401103M31830047 +8401103M32140010 +8401103M32450016 +8401103M32750026 +8401103M33080007 +8401103M33360018 + account2 assets:receivable:ehj + if 8401103M32740025 account2 assets:sponsoring:debian diff --git a/data/2013/income/ehj.ledger b/data/2013/income/ehj.ledger index 5bcb1e3..5155b49 100644 --- a/data/2013/income/ehj.ledger +++ b/data/2013/income/ehj.ledger @@ -1,70 +1,73 @@ 01-02=01-03 013901 - assets:receivable:ehj 40 € @@ 298,01 + assets:receivable:ehj 268,01 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 02-04=02-05 013902 - assets:receivable:ehj 40 € @@ 298 + assets:receivable:ehj 268 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 03-04=03-05 013903 - assets:receivable:ehj 40 € @@ 297,82 + assets:receivable:ehj 267,82 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 04-02=04-04 013904 - assets:receivable:ehj 40 € @@ 298,14 + assets:receivable:ehj 267,79 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 - - - +05-02 013905 + assets:receivable:ehj 267,84 + income:sales:redpill + liabilities:tax:sales -67 + expenses:non-vat:bank:fees -30 + expenses:non-vat:bank:fees -100 06-03=06-04 013906 - assets:receivable:ehj 40 € @@ 297,77 + assets:receivable:ehj 267,77 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 07-02=07-03 013907 - assets:receivable:ehj 40 € @@ 298 + assets:receivable:ehj 268 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 08-02=08-03 013908 - assets:receivable:ehj 40 € @@ 297,80 + assets:receivable:ehj 267,80 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 09-02=09-03 013909 - assets:receivable:ehj 40 € @@ 297,98 + assets:receivable:ehj 267,98 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 10-02=10-03 013910 - assets:receivable:ehj 40 € @@ 297,93 + assets:receivable:ehj 222,93 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -75 11-02=11-03 013911 - assets:receivable:ehj 40 € @@ 297,90 + assets:receivable:ehj 197,90 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -100 12-02=12-03 013912 - assets:receivable:ehj 40 € @@ 297,92 + assets:receivable:ehj 167,92 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 diff --git a/data/2014/assets/84011036773.csv.local.rules b/data/2014/assets/84011036773.csv.local.rules index cd39331..0d750ce 100644 --- a/data/2014/assets/84011036773.csv.local.rules +++ b/data/2014/assets/84011036773.csv.local.rules @@ -3,3 +3,14 @@ if 8401103M42090005 if 8401103M42160020 account2 assets:sponsoring:debian + +if +8401103M40020013 +8401103M40340017 +8401103M40620029 +8401103M40920020 +8401103M41220022 +8401103M41530030 +8401103M41830038 +8401103M42160027 + account2 assets:receivable:ehj diff --git a/data/2014/income/ehj.ledger b/data/2014/income/ehj.ledger index 6d9182d..3a5bcde 100644 --- a/data/2014/income/ehj.ledger +++ b/data/2014/income/ehj.ledger @@ -1,51 +1,54 @@ 01-02=01-06 014901 - assets:receivable:ehj 40 € @@ 297,90 + assets:receivable:ehj 167,90 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 02-03=02-05 014902 - assets:receivable:ehj 40 € @@ 298,02 + assets:receivable:ehj 168,02 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 03-03=03-05 014903 - assets:receivable:ehj 40 € @@ 298,04 + assets:receivable:ehj 168,04 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 - - - +04-02 014904 + assets:receivable:ehj 168,14 + income:sales:redpill + liabilities:tax:sales -67 + expenses:non-vat:bank:fees -30 + expenses:non-vat:bank:fees -100 05-02=05-06 014905 - assets:receivable:ehj 40 € @@ 298,10 + assets:receivable:ehj 168,10 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 06-02=06-03 014906 - assets:receivable:ehj 40 € @@ 298,06 + assets:receivable:ehj 168,06 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 07-02=07-03 014907 - assets:receivable:ehj 40 € @@ 297,79 + assets:receivable:ehj 167,79 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 expenses:non-vat:bank:fees -100 08-04=08-05 014908 - assets:receivable:ehj 40 € @@ 297,76 + assets:receivable:ehj 167,76 income:sales:redpill liabilities:tax:sales -67 expenses:non-vat:bank:fees -30 -- cgit v1.2.3