From 75f484cf53923b2734363b5ed3c81623037aeac3 Mon Sep 17 00:00:00 2001 From: Sven Donath Date: Wed, 13 Oct 2010 22:08:18 +0200 Subject: [PATCH] =?utf8?q?Vorgaben=20bei=20Neuinstallation=20auf=20sinnvol?= =?utf8?q?lere=20Werte=20ge=C3=A4ndert.=20Das=20sind:=20=20=20*=20"Stck"?= =?utf8?q?=20statt=20"mg"=20an=20erste=20Stelle.=20Alle=20anderen=20von=20?= =?utf8?q?gro=C3=9F=20nach=20klein=20sortiert=20=20=20*=20"EUR:USD"=20als?= =?utf8?q?=20Vorgabe=20f=C3=BCr=20W=C3=A4hrungen.=20=20=20*=20"Standard=20?= =?utf8?q?16%/19%"=20Buchungsgruppe=20an=20erste=20Stelle=20gesetzt=20Alle?= =?utf8?q?=20=C3=84nderungen=20sollen=20den=20Start=20nach=20der=20Neuinst?= =?utf8?q?allation=20vereinfachen=20und=20bei=20Updates=20nichts=20ver?= =?utf8?q?=C3=A4ndern.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sql/Pg-upgrade2/buchungsgruppen_sortkey.sql | 4 ++++ sql/lx-office.sql | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) 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'); -- -- 2.20.1