Merge von 702 aus unstable:

Aenderungen aus r690 in der upgrade.sql ans Ende verschoben, der besseren Wartbarkeit wegen.

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 7fc8516..9101695 100644 (file)
--- a/sql/Pg-upgrade-2.1.1-2.1.2.sql
+++ b/sql/Pg-upgrade-2.1.1-2.1.2.sql
@@ -67,10 +67,6 @@ alter table invoice add column fxsellprice numeric(15,5);
 update invoice set fxsellprice=fxsellpriceold;
 alter table invoice drop column fxsellpriceold;
 --
-alter table invoice add column ordnumber text;
-alter table invoice add column transdate text;
-alter table invoice add column cusordnumber text;
---
 --TABLE oe
 alter table oe rename column amount to amountold;
 alter table oe add column amount numeric(15,5);
@@ -88,10 +84,6 @@ alter table orderitems add column sellprice numeric(15,5);
 update orderitems set sellprice=sellpriceold;
 alter table orderitems drop column sellpriceold;
 --
-alter table orderitems add column ordnumber text;
-alter table orderitems add column transdate text;
-alter table orderitems add column cusordnumber text;
---
 --TABLE parts
 alter table parts rename column listprice to listpriceold;
 alter table parts add column listprice numeric(15,5);
@@ -245,3 +237,13 @@ ALTER TABLE orderitems ADD column pricegroup_id integer;
 update defaults set version = '2.1.2', audittrail = 't';
 --
 
+-- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
+
+alter table orderitems add column ordnumber text;
+alter table orderitems add column transdate text;
+alter table orderitems add column cusordnumber text;
+alter table invoice add column ordnumber text;
+alter table invoice add column transdate text;
+alter table invoice add column cusordnumber text;
+--
+