Merge von 580 aus unstable: Fixed Bug #199

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 476e4020bd68c0d8af4ddc67171d4e28e765f314..7ff54927a0206f8c4a5ba38490171f26cc4004cb 100644 (file)
--- a/sql/Pg-upgrade-2.1.1-2.1.2.sql
+++ b/sql/Pg-upgrade-2.1.1-2.1.2.sql
@@ -170,7 +170,6 @@ alter table acc_trans add foreign key (chart_id) references chart (id);
 alter table invoice add foreign key (parts_id) references parts (id);
 alter table ar add foreign key (customer_id) references customer (id);
 alter table ap add foreign key (vendor_id) references vendor (id);
-alter table orderitems add foreign key (trans_id) references oe (id);
 alter table orderitems add foreign key (parts_id) references parts (id);
 
 --Modify the possible length of bank account numbers

diff --git a/sql/lx-office.sql b/sql/lx-office.sql
index 3be0a85465669e8f402a68fc556349f9af8021e4..18f27aae77bc90e370dbbef4ff5d07d92814cb17 100644 (file)
--- a/sql/lx-office.sql
+++ b/sql/lx-office.sql
@@ -370,7 +370,7 @@ CREATE TABLE "oe" (
 );
 
 CREATE TABLE "orderitems" (
-       "trans_id" integer REFERENCES oe (id),
+       "trans_id" integer,
        "parts_id" integer REFERENCES parts (id),
        "description" text,
        "qty" real,