X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FSwitzerland-deutsch-ohneMWST-2014-chart.sql;h=c1b11e452a8308dd3472470fdadbdbb4a81ca8f4;hb=14304a6a27f1057646fc088364fd4625c24860dd;hp=31d1b0e3741b5d753006e6b546f61e4d02b5d642;hpb=14d71a6d1215e4fc67136c060fd21cd6c59602af;p=kivitendo-erp.git

diff --git a/sql/Switzerland-deutsch-ohneMWST-2014-chart.sql b/sql/Switzerland-deutsch-ohneMWST-2014-chart.sql
index 31d1b0e37..c1b11e452 100644
--- a/sql/Switzerland-deutsch-ohneMWST-2014-chart.sql
+++ b/sql/Switzerland-deutsch-ohneMWST-2014-chart.sql
@@ -5,7 +5,7 @@
 
 DELETE FROM chart;
 
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_er, datevautomatik, valid_from) VALUES
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
 ('1',    'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('10',   'UMLAUFSVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('100',  'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
@@ -17,8 +17,8 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, ta
 ('1100', 'Forderungen aus Lieferungen und Leistungen','A','A','AR','1100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('114',  'Übrige kurzfristige Forderungen','H','','','114',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('1140', 'Vorschüsse, kurzfristige Darlehen','A','A','AR','1140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1170', 'Vorsteuer auf Aufwand','A','A','','1170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1171', 'Vorsteuer auf Investitionen','A','A','','1171',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1170', 'Vorsteuer auf Aufwand','A','A','AP_tax:IC_taxpart:IC_taxservice','1170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1171', 'Vorsteuer auf Investitionen','A','A','AP_tax:IC_taxpart:IC_taxservice','1171',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('1176', 'Verrechnungssteuer','A','A','','1176',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('120',  'Vorräte und nicht fakturierte Dienstleistungen','H','','','120',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('1200', 'Handelswaren','A','A','IC','1200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
@@ -168,11 +168,11 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, ta
 ('6900', 'Finanzaufwand','A','E','','6900',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
 ('6940', 'Bankspesen','A','E','','6940',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
 ('6942', 'Kursverluste','A','E','','6942',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6943', 'Rundungsaufwand','A','E','','6943',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6943', 'Rundungsaufwand','A','E','AP_amount:IC_cogs:IC_expense','6943',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
 ('695',  'Finanzertrag','H','','','695',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
 ('6950', 'Finanzertrag','A','I','','6950',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
 ('6952', 'Kursgewinne','A','I','','6952',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('6953', 'Rundungsertrag','A','I','','6953',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('6953', 'Rundungsertrag','A','I','AR_amount:IC_sale:IC_income','6953',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
 ('6970', 'Mitgliederbeiträge','A','I','AR_amount:IC_income','6970',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
 ('6980', 'Spenden','A','I','AR_amount:IC_income','6980',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
 ('7',    'BETRIEBLICHER NEBENERFOLG','H','','','7',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
@@ -208,13 +208,7 @@ INSERT INTO buchungsgruppen (
   income_accno_id_2, expense_accno_id_2,
   income_accno_id_3, expense_accno_id_3
 ) VALUES (
-  'Standard 8%',(SELECT id FROM chart WHERE accno = '1200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200')
-),(
-  'Standard 2.5%',(SELECT id FROM chart WHERE accno = '1200'),
+  'Standard',(SELECT id FROM chart WHERE accno = '1200'),
   (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
   (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
   (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
@@ -238,12 +232,12 @@ INSERT INTO tax (taxkey, taxdescription, rate) VALUES
 (1, 'Mehrwertsteuerfrei', 0);
 
 INSERT INTO tax (taxkey, taxdescription, rate, taxnumber, chart_id) VALUES
-(2, 'MWST 8% Ertrag', 0.08000, '2200', (SELECT id FROM chart WHERE accno='2200')),
-(3, 'MWST 2.5% Ertrag', 0.02500, '2201', (SELECT id FROM chart WHERE accno='2201')),
-(4, 'MWST 8% Aufwand', 0.08000, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(5, 'MWST 2.5% Aufwand', 0.02500, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(6, 'MWST 8% Investitionen', 0.08000, '1171', (SELECT id FROM chart WHERE accno='1171')),
-(7, 'MWST 2.5% Investitionen', 0.02500, '1171', (SELECT id FROM chart WHERE accno='1171'));
+(2, 'MWST', 0.08000, '2200', (SELECT id FROM chart WHERE accno='2200')),
+(3, 'MWST', 0.02500, '2201', (SELECT id FROM chart WHERE accno='2201')),
+(4, 'MWST Aufwand', 0.08000, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(5, 'MWST Aufwand', 0.02500, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(6, 'MWST Investitionen', 0.08000, '1171', (SELECT id FROM chart WHERE accno='1171')),
+(7, 'MWST Investitionen', 0.02500, '1171', (SELECT id FROM chart WHERE accno='1171'));
 
 
 DELETE FROM taxkeys;