From f89126bfad2c3530ece191edbf6883d0ccded7f0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Sep 2019 20:27:54 +0200 Subject: Link invoices 014011 018003 with payments, and correct (previously estimated) exchange rates. --- data/2014/income/misc.ledger | 5 ++--- data/2015/assets/84011036773.csv.local.rules | 4 ++++ data/2018/assets/84011036773.csv.local.rules | 3 +++ data/2018/income/misc.ledger | 17 +++++++++-------- 4 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 data/2018/assets/84011036773.csv.local.rules diff --git a/data/2014/income/misc.ledger b/data/2014/income/misc.ledger index 62d9251..044b83b 100644 --- a/data/2014/income/misc.ledger +++ b/data/2014/income/misc.ledger @@ -13,7 +13,6 @@ expenses:non-vat:travel expenses:non-vat:bank:fees 30 -; TODO: replace estimated currency with actual exchange -08-23=08-31 014011; Regarding Skolelinux Germany +08-23=2015-03-27 014011; Regarding Skolelinux Germany assets:receivable:fsub - income:sales:eu:support -1200 € @ 7,445; Migration of server + income:sales:eu:support -1200 € @@ 8.915,04; Migration of server diff --git a/data/2015/assets/84011036773.csv.local.rules b/data/2015/assets/84011036773.csv.local.rules index 210bed2..8bc06e3 100644 --- a/data/2015/assets/84011036773.csv.local.rules +++ b/data/2015/assets/84011036773.csv.local.rules @@ -5,3 +5,7 @@ DK-NOTA42093 SKAGENFOOD DK-NOTA14934 SKAT.DK Ovf. underskudsdækning account2 assets:advances:jonas + +if +8401103M50860039 + account2 assets:receivable:fsub diff --git a/data/2018/assets/84011036773.csv.local.rules b/data/2018/assets/84011036773.csv.local.rules new file mode 100644 index 0000000..7846eca --- /dev/null +++ b/data/2018/assets/84011036773.csv.local.rules @@ -0,0 +1,3 @@ +if +FREIE SOFTWARE U + account2 assets:receivable:fsub diff --git a/data/2018/income/misc.ledger b/data/2018/income/misc.ledger index 79818f0..7ffc357 100644 --- a/data/2018/income/misc.ledger +++ b/data/2018/income/misc.ledger @@ -1,16 +1,17 @@ -; TODO: replace estimated currency with actual exchange 01-21=02-21 018001; Regarding Skolelinux Germany assets:receivable:fsub - income:sales:eu:support -360 € @ 7,445; Server administration 2016: 12 months á € 30 + income:sales:eu:support -360 €; Server administration 2016: 12 months á € 30 -; TODO: replace estimated currency with actual exchange 01-21=02-21 018002; Regarding Skolelinux Germany assets:receivable:fsub - income:sales:eu:support -360 € @ 7,445; Server administration 2017: 12 months á € 30 + income:sales:eu:support -360 €; Server administration 2017: 12 months á € 30 -; TODO: replace estimated currency with actual exchange 01-21=02-21 018003; Regarding Skolelinux Germany assets:receivable:fsub - income:sales:eu:support -500 € @ 7,445; Workshops December 6th, 8th, 9th - liabilities:payable:travel:train -152,95 € @ 7,445; Travel, Paris - Gütersloh - liabilities:payable:travel:train -104,70 € @ 7,445; Travel, Gütersloh - Holbaek + income:sales:eu:support -500 €; Workshops December 6th, 8th, 9th + liabilities:payable:travel:train -152,95 €; Travel, Paris - Gütersloh + liabilities:payable:travel:train -104,70 €; Travel, Gütersloh - Holbaek + +01-21=02-21 + assets:receivable:fsub 10.935,37 + assets:receivable:fsub -1.477,65 € -- cgit v1.2.3