Merge von 784,790 aus unstable: Bugfix 220 Nachtrag Variablen

[mfinanz.git] / sql / lx-office.sql

diff --git a/sql/lx-office.sql b/sql/lx-office.sql
index 240803396ca033465638eeda868ead1eebc7e720..ca5b1d35e52c605fb279f7cd58d95bc23e3b2ca2 100644 (file)
--- a/sql/lx-office.sql
+++ b/sql/lx-office.sql
@@ -243,7 +243,7 @@ CREATE TABLE "customer" (
         "obsolete" boolean DEFAULT 'f',
         "ustid" varchar(12),
         "username" varchar(50),
-        "user_password" varchar(12),
+        "user_password" text,
         "salesman_id" integer,
         "c_vendor_id" text,
         "klass" integer DEFAULT 0
@@ -397,7 +397,7 @@ CREATE TABLE "orderitems" (
        "reqdate" date,
        "ship" real,
        "serialnumber" text,
-       "id" integer DEFAULT nextval('orderitemsid'::text) PRIMARY KEY,
+       "id" integer DEFAULT nextval('orderitemsid'::text),
         "itime" timestamp DEFAULT now(),
         "mtime" timestamp,
         "pricegroup_id" integer,