X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade2%2Ftax_reverse_charge_key_18.sql;h=f67eff3d9bc3af01a2dcca628f17d115dba34862;hb=a6e0a7f493d24aec0eebede85eeaa5e724bd2e11;hp=024e7c48dd639684292b293bdfddc308ccd8505f;hpb=30b4a78c4100ebdcd6e6917fbcbf1d12f4f7b4d6;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade2/tax_reverse_charge_key_18.sql b/sql/Pg-upgrade2/tax_reverse_charge_key_18.sql
index 024e7c48d..f67eff3d9 100644
--- a/sql/Pg-upgrade2/tax_reverse_charge_key_18.sql
+++ b/sql/Pg-upgrade2/tax_reverse_charge_key_18.sql
@@ -1,6 +1,6 @@
 -- @tag: tax_reverse_charge_key_18
 -- @description: Reverse Charge für Kreditorenbelege Steuerschlüssel 18
--- @depends: release_3_6_0
+-- @depends: release_3_6_0 clean_tax_18_19
 -- @ignore: 0
 
 INSERT INTO tax (
@@ -41,8 +41,11 @@ WHERE EXISTS ( -- update only for SKR04
 
 -- if not defined
 insert into taxkeys(chart_id,tax_id,taxkey_id,startdate) SELECT (SELECT reverse_charge_chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null),0,0,'1970-01-01' WHERE NOT EXISTS
-  (SELECT chart_id from taxkeys where chart_id = ( SELECT reverse_charge_chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null));
+  (SELECT chart_id from taxkeys where chart_id = ( SELECT reverse_charge_chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null))
+  AND (EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR04EU') OR EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR03EU'));
+
 -- if not defined
 insert into taxkeys(chart_id,tax_id,taxkey_id,startdate) SELECT (SELECT chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null),0,0,'1970-01-01' WHERE NOT EXISTS
-  (SELECT chart_id from taxkeys where chart_id = ( SELECT chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null));
+  (SELECT chart_id from taxkeys where chart_id = ( SELECT chart_id FROM tax WHERE taxkey = '18' and rate = 0.07 and reverse_charge_chart_id is not null))
+  AND (EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR04EU') OR EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR03EU'));