X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/692cdaa86a5808a2bd7c65a51256a43a9eb109d3..b293ff8ad52fc76ba0c44783e3982418114d6b08:/sql/Pg-upgrade2/tax_reverse_charge.sql

diff --git a/sql/Pg-upgrade2/tax_reverse_charge.sql b/sql/Pg-upgrade2/tax_reverse_charge.sql
index bf1a07d80..91ba9c111 100644
--- a/sql/Pg-upgrade2/tax_reverse_charge.sql
+++ b/sql/Pg-upgrade2/tax_reverse_charge.sql
@@ -1,7 +1,7 @@
 -- @tag: tax_reverse_charge
 -- @description: Reverse Charge für Kreditorenbelege
 -- @depends: release_3_6_0
--- @ignore: 1
+-- @ignore: 0
 
 ALTER TABLE tax add column reverse_charge_chart_id integer;
 
@@ -99,10 +99,11 @@ WHERE EXISTS ( -- update only for SKR03
     WHERE defaults.coa='Germany-DATEV-SKR04EU'
 );
 
-;
 -- if not defined
 insert into taxkeys(chart_id,tax_id,taxkey_id,startdate) SELECT (SELECT chart_id FROM tax WHERE taxkey = '94'),0,0,'1970-01-01' WHERE NOT EXISTS
-  (SELECT chart_id from taxkeys where chart_id = ( SELECT chart_id FROM tax WHERE taxkey = '94') ;
-insert into taxkeys(chart_id,tax_id,taxkey_id,startdate) SELECT (SELECT reverse_charge_chart_id FROM tax WHERE taxkey = '94'),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 = '94');
+  (SELECT chart_id from taxkeys where chart_id = ( SELECT chart_id FROM tax WHERE taxkey = '94'))
+  AND (EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR04EU') OR EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR03EU'));
 
+insert into taxkeys(chart_id,tax_id,taxkey_id,startdate) SELECT (SELECT reverse_charge_chart_id FROM tax WHERE taxkey = '94'),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 = '94'))
+    AND (EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR04EU') OR EXISTS (SELECT coa FROM defaults WHERE defaults.coa='Germany-DATEV-SKR03EU'));