Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / 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 bf1a07d8027eaa5ed2ce6e34d5b10166f06064c9..91ba9c11186e72d5e09e16dd9a41afc707851cb1 100644 (file)
--- 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
 -- @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;
 
 
 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'
 );
 
     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
 -- 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'));