Merge branch 'master' of lx-office.linet-services.de:lx-office-erp

[kivitendo-erp.git] / sql / lx-office.sql

diff --git a/sql/lx-office.sql b/sql/lx-office.sql
index e57a683..3cffed0 100644 (file)
--- a/sql/lx-office.sql
+++ b/sql/lx-office.sql
@@ -142,7 +142,7 @@ CREATE TABLE parts (
     not_discountable boolean DEFAULT false,
     buchungsgruppen_id integer,
     payment_id integer
-);
+) WITH OIDS;
 
 
 --
@@ -216,7 +216,7 @@ CREATE TABLE acc_trans (
     taxkey integer,
     itime timestamp without time zone DEFAULT now(),
     mtime timestamp without time zone
-);
+) WITH OIDS;
 
 
 --
@@ -248,7 +248,7 @@ CREATE TABLE invoice (
     base_qty real,
     subtotal boolean DEFAULT false,
     longdescription text
-);
+) WITH OIDS;
 
 
 --
@@ -395,7 +395,7 @@ CREATE TABLE assembly (
     bom boolean,
     itime timestamp without time zone DEFAULT now(),
     mtime timestamp without time zone
-);
+) WITH OIDS;
 
 
 --
@@ -602,7 +602,7 @@ CREATE TABLE orderitems (
     base_qty real,
     subtotal boolean DEFAULT false,
     longdescription text
-);
+) WITH OIDS;
 
 
 --
@@ -694,7 +694,7 @@ CREATE TABLE partsgroup (
     partsgroup text,
     itime timestamp without time zone DEFAULT now(),
     mtime timestamp without time zone
-);
+) WITH OIDS;
 
 
 --
@@ -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');
 
 
 --