Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / sql / Pg-upgrade2 / new_chart_1593_1495.sql

diff --git a/sql/Pg-upgrade2/new_chart_1593_1495.sql b/sql/Pg-upgrade2/new_chart_1593_1495.sql
index 5a512ba34b0373f4348deffb82849a98b423c0dc..d6f83d7691ffc1e60978e7ca61ab30bb862cbfe1 100644 (file)
--- a/sql/Pg-upgrade2/new_chart_1593_1495.sql
+++ b/sql/Pg-upgrade2/new_chart_1593_1495.sql
@@ -13,7 +13,7 @@ BEGIN
     BEGIN
       IF ( SELECT COUNT(accno) FROM chart WHERE accno LIKE new_accno ) = 0 THEN
         INSERT INTO chart (accno, description, charttype, category, link, taxkey_id)
     BEGIN
       IF ( SELECT COUNT(accno) FROM chart WHERE accno LIKE new_accno ) = 0 THEN
         INSERT INTO chart (accno, description, charttype, category, link, taxkey_id)

-          VALUES (new_accno, 'Verrechnungskonto erhalt. Anzahl. bei Buchung über Debitorenkonto','A', 'L', 'AR', 0);
+          VALUES (new_accno, 'Verrechnungskonto erhalt. Anzahl. bei Buchung über Debitorenkonto','A', 'L', 'AR_amount', 0);

         INSERT INTO taxkeys (chart_id, tax_id, taxkey_id, startdate)
           VALUES ((SELECT id FROM chart WHERE accno LIKE new_accno), 0, 0, '1970-01-01');
       END IF;
         INSERT INTO taxkeys (chart_id, tax_id, taxkey_id, startdate)
           VALUES ((SELECT id FROM chart WHERE accno LIKE new_accno), 0, 0, '1970-01-01');
       END IF;


@@ -27,7 +27,7 @@ BEGIN
     BEGIN
       IF ( SELECT COUNT(accno) FROM chart WHERE accno LIKE new_accno ) = 0 THEN
         INSERT INTO chart (accno, description, charttype, category, link, taxkey_id)
     BEGIN
       IF ( SELECT COUNT(accno) FROM chart WHERE accno LIKE new_accno ) = 0 THEN
         INSERT INTO chart (accno, description, charttype, category, link, taxkey_id)

-          VALUES (new_accno, 'Verrechnungskonto erhalt. Anzahl. bei Buchung über Debitorenkonto','A', 'L', 'AR', 0);
+          VALUES (new_accno, 'Verrechnungskonto erhalt. Anzahl. bei Buchung über Debitorenkonto','A', 'L', 'AR_amount', 0);

         INSERT INTO taxkeys (chart_id, tax_id, taxkey_id, startdate)
           VALUES ((SELECT id FROM chart WHERE accno LIKE new_accno), 0, 0, '1970-01-01');
       END IF;
         INSERT INTO taxkeys (chart_id, tax_id, taxkey_id, startdate)
           VALUES ((SELECT id FROM chart WHERE accno LIKE new_accno), 0, 0, '1970-01-01');
       END IF;