Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 63a1c75d

Von Stephan Köhler vor mehr als 18 Jahren hinzugefügt

  • ID 63a1c75d320045aea95c6bfd2444716d34882a56
  • Vorgänger ae940205
  • Nachfolger c1dafb84

Merge von 816-819,828 aus unstable: UStVa Bugfix, Bug 262 & 264
-816
Bug 262 fixed!
USTVA UPDATE der Positionen und Verknuepfungen.
Die UPDATEs sind relativ vollstaendig und sortiert,
so dass eine weitere Pflege einfach ist. taxkey's sind noch nicht
integriert, deshalb sind einige updates in liste.aql doppelt gemoppelt,
was m.E. unproblematisch ist, gleiches gilt für
den Germany-DATEV-SKR03EU-chart.sql
-817
Bug 264 fixed. Thanks to Martin Krung.
-818
Fixed date problems between database and screen-output,
reported by Holger on the devel-ML.
-819
Update table tax
-828
USTVA: Fixed upgrade Problems for tax table

Unterschiede anzeigen:

sql/Germany-DATEV-SKR03EU-chart.sql
377 377
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2215', 'Zinsabschlagsteuer', 'A', 'E', '', '2215', 0, NULL, 35, NULL, NULL, FALSE);
378 378
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2218', 'Anrechb.Solidari.zuschlag a.Zinsabschlagst.', 'A', 'E', '', '2218', 0, NULL, 35, NULL, NULL, FALSE);
379 379

  
380
INSERT INTO tax (rate, taxkey, taxdescription) values ('0','0','Keine Steuer');
381
INSERT INTO tax (rate, taxkey, taxdescription) values ('0','1','Umsatzsteuerfrei');
382
insert into tax VALUES ((select id from chart where accno = '1771'),'0.07','1771','2','Umsatzsteuer 7%');
383
INSERT INTO tax VALUES ((select id from chart where accno = '1775'),'0.16','1775','3','Umsatzsteuer 16%');
384
INSERT INTO tax VALUES ((select id from chart where accno = '1571'),'0.07','1571','8','Vorsteuer 7%');
385
insert into tax VALUES ((select id from chart where accno = '1575'),'0.16','1575','9','Vorsteuer 16%');
386
insert into tax (taxkey, taxdescription) values ('10','Im anderen EG-Staat steuerpfl. Lieferung');
387
insert into tax (taxkey, taxdescription) values ('11','Steuerfreie EG-Lief. an Abn. mit UStIdNr');
388
insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1772'),'0.07','1772','12','Steuerpflicht. EG-Lieferungen 7%');
389
insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1772'),'0.16','1773','13','Steuerpflicht. EG-Lieferungen 16%');
390
insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1572'),'0.07','1572','18','Steuerpflicht. EG-Erwerb 7%');
391
insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1572'),'0.16','1573','19','Steuerpflicht. EG-Erwerb 16%');
380
-- insert actual tax values for SKR03
381
INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','0','Keine Steuer');
382
INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','1','Umsatzsteuerfrei (mit Vorsteuerabzug)');
383
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1771'),'0.07','1771','2','Umsatzsteuer 7%');
384
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1775'),'0.16','1775','3','Umsatzsteuer 16%');
385
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1571'),'0.07','1571','8','Vorsteuer 7%');
386
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1575'),'0.16','1575','9','Vorsteuer 16%');
387
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1767'),'0.00','1767','10','Im anderen EG-Staat steuerpfl. Lieferung');
388
INSERT INTO tax (taxkey, taxdescription) VALUES ('11','Steuerfreie EG-Lief. an Abn. mit UStIdNr');
389
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1772'),'0.07','1772','12','Umsatzsteuer 7% innergem. Erwerb');
390
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1773'),'0.16','1773','13','Umsatzsteuer 16% innergem. Erwerb');
391
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.07','1572','18','Steuerpfl. EG-Erwerb 7%');
392
INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.16','1573','19','Steuerpfl. EG-Erwerb 16%');
393

  
394
-- UStVA Link to SKR03/2006
395
-- Let this structure like it is, please.
396
-- This structure is based on the sequence of the USTVA 2006
397
-- Created by Udo Spallek
398
--
399
-- 1. Page UStVA
400

  
401
UPDATE chart SET pos_ustva=41  WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828');
402
UPDATE chart SET pos_ustva=44  WHERE accno IN ('8135');
403
UPDATE chart SET pos_ustva=49  WHERE accno IN ('');
404
UPDATE chart SET pos_ustva=43  WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827');
405
UPDATE chart SET pos_ustva=48  WHERE accno IN ('8100', '8110', '8504', '8609');
406
UPDATE chart SET pos_ustva=51  WHERE accno IN ('1717', '2404', '2405', '2700', '2705', '2707', '2709', '8196', '8315', '8400', '8595', '8600', '8611', '8640', '8720', '8726', '8735', '8760', '8790', '8801', '8809', '8820', '8910', '8920', '8921', '8922', '8925', '8935', '8940');
407
UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775');
408
UPDATE chart SET pos_ustva=86  WHERE accno IN ('1711', '2401', '2403', '8300', '8310', '8506', '8591', '8630', '8710', '8725', '8731', '8750', '8780', '8915', '8930', '8932', '8945');
409
UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771');
410
UPDATE chart SET pos_ustva=35  WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794');
411
UPDATE chart SET pos_ustva=36  WHERE accno IN ('');
412
UPDATE chart SET pos_ustva=77  WHERE accno IN ('');
413
UPDATE chart SET pos_ustva=76  WHERE accno IN ('8190');
414
UPDATE chart SET pos_ustva=80  WHERE accno IN ('');
415
UPDATE chart SET pos_ustva=91  WHERE accno IN ('');
416
UPDATE chart SET pos_ustva=97  WHERE accno IN ('3425', '3725');
417
UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773');
418
UPDATE chart SET pos_ustva=93  WHERE accno IN ('3420', '3724');
419
UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772');
420
UPDATE chart SET pos_ustva=95  WHERE accno IN ('3727');
421
UPDATE chart SET pos_ustva=98  WHERE accno IN ('');
422
UPDATE chart SET pos_ustva=94  WHERE accno IN ('');
423
UPDATE chart SET pos_ustva=96  WHERE accno IN ('1784');
424
UPDATE chart SET pos_ustva=42  WHERE accno IN ('');
425
UPDATE chart SET pos_ustva=60  WHERE accno IN ('8337');
426
UPDATE chart SET pos_ustva=45  WHERE accno IN ('8338', '8339', '8950');
427
-- 2. Seite UStVA
428
UPDATE chart SET pos_ustva=52  WHERE accno IN ('');
429
UPDATE chart SET pos_ustva=53  WHERE accno IN ('');
430
UPDATE chart SET pos_ustva=73  WHERE accno IN ('');
431
UPDATE chart SET pos_ustva=74  WHERE accno IN ('');
432
UPDATE chart SET pos_ustva=84  WHERE accno IN ('3110', '3115', '3120', '3125');
433
UPDATE chart SET pos_ustva=85  WHERE accno IN ('1785', '1786');
434
UPDATE chart SET pos_ustva=65  WHERE accno IN ('1782');
435
UPDATE chart SET pos_ustva=66  WHERE accno IN ('1570', '1571', '1575', '1576');
436
UPDATE chart SET pos_ustva=61  WHERE accno IN ('1572', '1573');
437
UPDATE chart SET pos_ustva=62  WHERE accno IN ('1588');
438
UPDATE chart SET pos_ustva=67  WHERE accno IN ('1578', '1579');
439
UPDATE chart SET pos_ustva=63  WHERE accno IN ('1577');
440
UPDATE chart SET pos_ustva=64  WHERE accno IN ('1556', '1557', '1558', '1559');
441
UPDATE chart SET pos_ustva=59  WHERE accno IN ('');
442
UPDATE chart SET pos_ustva=69  WHERE accno IN ('1783');
443
UPDATE chart SET pos_ustva=39  WHERE accno IN ('1781');

Auch abrufbar als: Unified diff