From: Sven Donath Date: Wed, 13 Oct 2010 20:08:18 +0000 (+0200) Subject: Vorgaben bei Neuinstallation auf sinnvollere Werte geändert. X-Git-Tag: release-2.6.2beta1~101^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=75f484cf53923b2734363b5ed3c81623037aeac3;p=kivitendo-erp.git Vorgaben bei Neuinstallation auf sinnvollere Werte geändert. Das sind: * "Stck" statt "mg" an erste Stelle. Alle anderen von groß nach klein sortiert * "EUR:USD" als Vorgabe für Währungen. * "Standard 16%/19%" Buchungsgruppe an erste Stelle gesetzt Alle Änderungen sollen den Start nach der Neuinstallation vereinfachen und bei Updates nichts verändern. --- diff --git a/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql b/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql index 640559133..c78ee8973 100644 --- a/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql +++ b/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql @@ -6,3 +6,7 @@ CREATE SEQUENCE tmp_counter; UPDATE buchungsgruppen SET sortkey = nextval('tmp_counter'); DROP SEQUENCE tmp_counter; ALTER TABLE buchungsgruppen ALTER COLUMN sortkey SET NOT NULL; + +-- 'Standard 16%/19%' als ersten Eintrag. Der ermäßigte Umsatzsteuersatz wird seltener verwendet. +UPDATE buchungsgruppen SET sortkey=2 WHERE description='Standard 7%'; +UPDATE buchungsgruppen SET sortkey=1 WHERE description='Standard 16%/19%'; diff --git a/sql/lx-office.sql b/sql/lx-office.sql index 12819196c..3cffed08f 100644 --- a/sql/lx-office.sql +++ b/sql/lx-office.sql @@ -1253,8 +1253,7 @@ CREATE TABLE taxkeys ( -- Name: defaults; Type: TABLE DATA; Schema: public; Owner: postgres -- -INSERT INTO "defaults" ("version") VALUES ('2.4.0.0'); - +INSERT INTO "defaults" ("version", "curr") VALUES ('2.4.0.0', 'EUR:USD'); -- -- Data for TOC entry 204 (OID 1982194) @@ -1954,17 +1953,17 @@ INSERT INTO finanzamt (fa_land_nr, fa_bufa_nr, fa_name, fa_strasse, fa_plz, fa_o -- Name: units; Type: TABLE DATA; Schema: public; Owner: postgres -- -INSERT INTO units (name, base_unit, factor, "type") VALUES ('mg', NULL, NULL, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('g', 'mg', 1000.00000, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('kg', 'g', 1000.00000, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('t', 'kg', 1000.00000, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('ml', NULL, NULL, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('L', 'ml', 1000.00000, 'dimension'); INSERT INTO units (name, base_unit, factor, "type") VALUES ('Stck', NULL, NULL, 'dimension'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('min', NULL, 0.00000, 'service'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('Std', 'min', 60.00000, 'service'); -INSERT INTO units (name, base_unit, factor, "type") VALUES ('Tag', 'Std', 8.00000, 'service'); INSERT INTO units (name, base_unit, factor, "type") VALUES ('psch', NULL, 0.00000, 'service'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('Tag', 'Std', 8.00000, 'service'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('Std', 'min', 60.00000, 'service'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('min', NULL, 0.00000, 'service'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('t', 'kg', 1000.00000, 'dimension'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('kg', 'g', 1000.00000, 'dimension'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('g', 'mg', 1000.00000, 'dimension'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('mg', NULL, NULL, 'dimension'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('L', 'ml', 1000.00000, 'dimension'); +INSERT INTO units (name, base_unit, factor, "type") VALUES ('ml', NULL, NULL, 'dimension'); --