From: Udo Spallek Date: Fri, 20 Jan 2006 20:56:57 +0000 (+0000) Subject: Bug 262 fixed! X-Git-Tag: release-2.4.0^2~366 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2e1e2d4c36e8580c979339aff4a934fd52b96a8a;p=kivitendo-erp.git 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 --- diff --git a/sql/Germany-DATEV-SKR03EU-chart.sql b/sql/Germany-DATEV-SKR03EU-chart.sql index 602c2d0fb..1f5b79b62 100644 --- a/sql/Germany-DATEV-SKR03EU-chart.sql +++ b/sql/Germany-DATEV-SKR03EU-chart.sql @@ -388,4 +388,55 @@ insert into tax (taxkey, taxdescription) values ('11','Steuerfreie EG-Lief. an A 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%'); 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%'); 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%'); -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%'); \ No newline at end of file +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%'); + +-- UStVA Link to SKR03/2006 +-- Let this structure like it is, please. +-- This structure is based on the sequence of the USTVA 2006 +-- Created by Udo Spallek +-- +-- 1. Page UStVA + +UPDATE chart SET pos_ustva=41 WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828'); +UPDATE chart SET pos_ustva=44 WHERE accno IN ('8135'); +UPDATE chart SET pos_ustva=49 WHERE accno IN (''); +UPDATE chart SET pos_ustva=43 WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827'); +UPDATE chart SET pos_ustva=48 WHERE accno IN ('8100', '8110', '8504', '8609'); +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'); +UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775'); +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'); +UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771'); +UPDATE chart SET pos_ustva=35 WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794'); +UPDATE chart SET pos_ustva=36 WHERE accno IN (''); +UPDATE chart SET pos_ustva=77 WHERE accno IN (''); +UPDATE chart SET pos_ustva=76 WHERE accno IN ('8190'); +UPDATE chart SET pos_ustva=80 WHERE accno IN (''); +UPDATE chart SET pos_ustva=91 WHERE accno IN (''); +UPDATE chart SET pos_ustva=97 WHERE accno IN ('3425', '3725'); +UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773'); +UPDATE chart SET pos_ustva=93 WHERE accno IN ('3420', '3724'); +UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772'); +UPDATE chart SET pos_ustva=95 WHERE accno IN ('3727'); +UPDATE chart SET pos_ustva=98 WHERE accno IN (''); +UPDATE chart SET pos_ustva=94 WHERE accno IN (''); +UPDATE chart SET pos_ustva=96 WHERE accno IN ('1784'); +UPDATE chart SET pos_ustva=42 WHERE accno IN (''); +UPDATE chart SET pos_ustva=60 WHERE accno IN ('8337'); +UPDATE chart SET pos_ustva=45 WHERE accno IN ('8338', '8339', '8950'); +-- 2. Seite UStVA +UPDATE chart SET pos_ustva=52 WHERE accno IN (''); +UPDATE chart SET pos_ustva=53 WHERE accno IN (''); +UPDATE chart SET pos_ustva=73 WHERE accno IN (''); +UPDATE chart SET pos_ustva=74 WHERE accno IN (''); +UPDATE chart SET pos_ustva=84 WHERE accno IN ('3110', '3115', '3120', '3125'); +UPDATE chart SET pos_ustva=85 WHERE accno IN ('1785', '1786'); +UPDATE chart SET pos_ustva=65 WHERE accno IN ('1782'); +UPDATE chart SET pos_ustva=66 WHERE accno IN ('1570', '1571', '1575', '1576'); +UPDATE chart SET pos_ustva=61 WHERE accno IN ('1572', '1573'); +UPDATE chart SET pos_ustva=62 WHERE accno IN ('1588'); +UPDATE chart SET pos_ustva=67 WHERE accno IN ('1578', '1579'); +UPDATE chart SET pos_ustva=63 WHERE accno IN ('1577'); +UPDATE chart SET pos_ustva=64 WHERE accno IN ('1556', '1557', '1558', '1559'); +UPDATE chart SET pos_ustva=59 WHERE accno IN (''); +UPDATE chart SET pos_ustva=69 WHERE accno IN ('1783'); +UPDATE chart SET pos_ustva=39 WHERE accno IN ('1781'); diff --git a/sql/Pg-upgrade-2.1.1-2.1.2.sql b/sql/Pg-upgrade-2.1.1-2.1.2.sql index 8a1b97a89..d1a1c726c 100644 --- a/sql/Pg-upgrade-2.1.1-2.1.2.sql +++ b/sql/Pg-upgrade-2.1.1-2.1.2.sql @@ -252,5 +252,57 @@ alter table invoice add column ordnumber text; alter table invoice add column transdate text; alter table invoice add column cusordnumber text; -- +-- UStVA Link to SKR03/2006 +-- Let this structure like it is, please. +-- This structure is based on the sequence of the USTVA 2006 +-- Created by Udo Spallek +-- +-- 1. Page UStVA +UPDATE chart SET pos_ustva=41 WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828'); +UPDATE chart SET pos_ustva=44 WHERE accno IN ('8135'); +UPDATE chart SET pos_ustva=49 WHERE accno IN (''); +UPDATE chart SET pos_ustva=43 WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827'); +UPDATE chart SET pos_ustva=48 WHERE accno IN ('8100', '8110', '8504', '8609'); +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'); +UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775'); +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'); +UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771'); +UPDATE chart SET pos_ustva=35 WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794'); +UPDATE chart SET pos_ustva=36 WHERE accno IN (''); +UPDATE chart SET pos_ustva=77 WHERE accno IN (''); +UPDATE chart SET pos_ustva=76 WHERE accno IN ('8190'); +UPDATE chart SET pos_ustva=80 WHERE accno IN (''); +UPDATE chart SET pos_ustva=91 WHERE accno IN (''); +UPDATE chart SET pos_ustva=97 WHERE accno IN ('3425', '3725'); +UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773'); +UPDATE chart SET pos_ustva=93 WHERE accno IN ('3420', '3724'); +UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772'); +UPDATE chart SET pos_ustva=95 WHERE accno IN ('3727'); +UPDATE chart SET pos_ustva=98 WHERE accno IN (''); +UPDATE chart SET pos_ustva=94 WHERE accno IN (''); +UPDATE chart SET pos_ustva=96 WHERE accno IN ('1784'); +UPDATE chart SET pos_ustva=42 WHERE accno IN (''); +UPDATE chart SET pos_ustva=60 WHERE accno IN ('8337'); +UPDATE chart SET pos_ustva=45 WHERE accno IN ('8338', '8339', '8950'); +-- 2. Page UStVA +UPDATE chart SET pos_ustva=52 WHERE accno IN (''); +UPDATE chart SET pos_ustva=53 WHERE accno IN (''); +UPDATE chart SET pos_ustva=73 WHERE accno IN (''); +UPDATE chart SET pos_ustva=74 WHERE accno IN (''); +UPDATE chart SET pos_ustva=84 WHERE accno IN ('3110', '3115', '3120', '3125'); +UPDATE chart SET pos_ustva=85 WHERE accno IN ('1785', '1786'); +UPDATE chart SET pos_ustva=65 WHERE accno IN ('1782'); +UPDATE chart SET pos_ustva=66 WHERE accno IN ('1570', '1571', '1575', '1576'); +UPDATE chart SET pos_ustva=61 WHERE accno IN ('1572', '1573'); +UPDATE chart SET pos_ustva=62 WHERE accno IN ('1588'); +UPDATE chart SET pos_ustva=67 WHERE accno IN ('1578', '1579'); +UPDATE chart SET pos_ustva=63 WHERE accno IN ('1577'); +UPDATE chart SET pos_ustva=64 WHERE accno IN ('1556', '1557', '1558', '1559'); +UPDATE chart SET pos_ustva=59 WHERE accno IN (''); +UPDATE chart SET pos_ustva=69 WHERE accno IN ('1783'); +UPDATE chart SET pos_ustva=39 WHERE accno IN ('1781'); +-- update defaults set version = '2.1.2'; + + diff --git a/sql/liste.sql b/sql/liste.sql index 1da446b87..27dd28f0d 100644 --- a/sql/liste.sql +++ b/sql/liste.sql @@ -373,6 +373,54 @@ UPDATE chart set taxkey_id=0, pos_bwa=35 WHERE accno='2214'; UPDATE chart set taxkey_id=0, pos_bwa=35 WHERE accno='2215'; UPDATE chart set taxkey_id=0, pos_bwa=35 WHERE accno='2218'; +-- UStVA Link to SKR03/2006 +-- Let this structure like it is, please. +-- This structure is based on the sequence of the USTVA 2006 +-- The old statements above, will be mixed in the next version +-- Created by Udo Spallek +-- +-- 1. Page UStVA - - +UPDATE chart SET pos_ustva=41 WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828'); +UPDATE chart SET pos_ustva=44 WHERE accno IN ('8135'); +UPDATE chart SET pos_ustva=49 WHERE accno IN (''); +UPDATE chart SET pos_ustva=43 WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827'); +UPDATE chart SET pos_ustva=48 WHERE accno IN ('8100', '8110', '8504', '8609'); +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'); +UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775'); +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'); +UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771'); +UPDATE chart SET pos_ustva=35 WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794'); +UPDATE chart SET pos_ustva=36 WHERE accno IN (''); +UPDATE chart SET pos_ustva=77 WHERE accno IN (''); +UPDATE chart SET pos_ustva=76 WHERE accno IN ('8190'); +UPDATE chart SET pos_ustva=80 WHERE accno IN (''); +UPDATE chart SET pos_ustva=91 WHERE accno IN (''); +UPDATE chart SET pos_ustva=97 WHERE accno IN ('3425', '3725'); +UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773'); +UPDATE chart SET pos_ustva=93 WHERE accno IN ('3420', '3724'); +UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772'); +UPDATE chart SET pos_ustva=95 WHERE accno IN ('3727'); +UPDATE chart SET pos_ustva=98 WHERE accno IN (''); +UPDATE chart SET pos_ustva=94 WHERE accno IN (''); +UPDATE chart SET pos_ustva=96 WHERE accno IN ('1784'); +UPDATE chart SET pos_ustva=42 WHERE accno IN (''); +UPDATE chart SET pos_ustva=60 WHERE accno IN ('8337'); +UPDATE chart SET pos_ustva=45 WHERE accno IN ('8338', '8339', '8950'); +-- 2. Seite UStVA +UPDATE chart SET pos_ustva=52 WHERE accno IN (''); +UPDATE chart SET pos_ustva=53 WHERE accno IN (''); +UPDATE chart SET pos_ustva=73 WHERE accno IN (''); +UPDATE chart SET pos_ustva=74 WHERE accno IN (''); +UPDATE chart SET pos_ustva=84 WHERE accno IN ('3110', '3115', '3120', '3125'); +UPDATE chart SET pos_ustva=85 WHERE accno IN ('1785', '1786'); +UPDATE chart SET pos_ustva=65 WHERE accno IN ('1782'); +UPDATE chart SET pos_ustva=66 WHERE accno IN ('1570', '1571', '1575', '1576'); +UPDATE chart SET pos_ustva=61 WHERE accno IN ('1572', '1573'); +UPDATE chart SET pos_ustva=62 WHERE accno IN ('1588'); +UPDATE chart SET pos_ustva=67 WHERE accno IN ('1578', '1579'); +UPDATE chart SET pos_ustva=63 WHERE accno IN ('1577'); +UPDATE chart SET pos_ustva=64 WHERE accno IN ('1556', '1557', '1558', '1559'); +UPDATE chart SET pos_ustva=59 WHERE accno IN (''); +UPDATE chart SET pos_ustva=69 WHERE accno IN ('1783'); +UPDATE chart SET pos_ustva=39 WHERE accno IN ('1781');