IDEMPIERE-385 Resolve M_Storage locking and data consistency / Finish changes to database:

- view replacement for M_Storage – ad_table marked as view
- migration script from M_Storage to the two new tables
- migration script to fill M_Warehouse.ReserveLocator_ID
- generate UUID columns and model classes for the two new tables
- the unique index key m_storagereservation_pkey must have IsSOTrx
- reorg unique index key m_storagereonhand_pkey - most accessed columns first
- m_product_stock_v - restored to previous version based on M_Storage now view
- m_product_substituterelated_v - restored to previous version based on M_Storage now view

db/ddlutils/oracle/views/M_PRODUCT_STOCK_V.sql

@@ -1,8 +1,13 @@
-CREATE OR REPLACE VIEW m_product_stock_v AS 
+--create views
- SELECT ms.isactive, ms.created, ms.createdby, ms.updated, ms.updatedby, mp.value, mp.help, ms.qtyonhand - NVL(mr.qty,0) AS qtyavailable, ms.qtyonhand, NVL(mr.qty,0) as qtyreserved, mp.description, mw.name AS warehouse, mw.m_warehouse_id, mw.ad_client_id, mw.ad_org_id, mp.documentnote
+CREATE OR REPLACE VIEW M_PRODUCT_STOCK_V
-   FROM m_storageonhand ms
+AS
-   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+SELECT 
-   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+ms.IsActive, ms.Created, ms.CreatedBy, ms.Updated, ms.UpdatedBy,
-   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+mp.VALUE, mp.help, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, 
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+ms.qtyreserved, mp.description, mw.NAME AS warehouse, mw.m_warehouse_id, mw.ad_client_id, 
-  ORDER BY mw.name;
+mw.ad_org_id, mp.documentnote
+FROM M_STORAGE ms 
+JOIN M_PRODUCT mp ON ms.m_product_id = mp.m_product_id
+JOIN M_LOCATOR ml ON ms.m_locator_id = ml.m_locator_id
+JOIN M_WAREHOUSE mw ON ml.m_warehouse_id = mw.m_warehouse_id 
+ORDER BY mw.NAME;

db/ddlutils/oracle/views/M_PRODUCT_SUBSTITUTERELATED_V.sql

@@ -1,22 +1,78 @@
-CREATE OR REPLACE VIEW m_product_substituterelated_v AS 
+CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS
-         SELECT s.ad_client_id, s.ad_org_id, s.isactive, s.created, s.createdby, s.updated, s.updatedby, s.m_product_id, s.substitute_id, 'S' AS rowtype, mp.name, sum(ms.qtyonhand - NVL(mr.qty,0)) AS qtyavailable, sum(ms.qtyonhand) AS qtyonhand, NVL(sum(mr.qty),0) AS qtyreserved, round(max(mpr.pricestd), 0) AS pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id, org.name AS orgname
+SELECT s.ad_client_id, 
+		s.ad_org_id, 
+		s.isactive, 
+		s.created, 
+		s.createdby, 
+		s.updated, 
+		s.updatedby,
+		s.m_product_id, 
+		s.substitute_id, 
+		'S' AS rowtype,
+		mp.name, 
+		sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+		sum(ms.qtyonhand) AS qtyonhand, 
+		sum(ms.qtyreserved) AS qtyreserved,
+		ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+		mpr.m_pricelist_version_id, 
+		mw.m_warehouse_id, 
+		org.name AS orgname
            FROM m_substitute s
-      JOIN m_storageonhand ms ON ms.m_product_id = s.substitute_id
+      JOIN m_storage ms ON ms.m_product_id = s.substitute_id
    JOIN m_product mp ON ms.m_product_id = mp.m_product_id
    JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
    JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
    JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
    JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+   GROUP BY s.ad_client_id, 
-  GROUP BY s.ad_client_id, s.ad_org_id, s.isactive, s.created, s.createdby, s.updated, s.updatedby, s.m_product_id, s.substitute_id, mw.m_warehouse_id, mpr.m_pricelist_version_id, org.name, mp.name
+   			s.ad_org_id, 
-UNION 
+   			s.isactive, 
-         SELECT r.ad_client_id, r.ad_org_id, r.isactive, r.created, r.createdby, r.updated, r.updatedby, r.m_product_id, r.relatedproduct_id AS substitute_id, 'R' AS rowtype, mp.name, sum(ms.qtyonhand - NVL(mr.qty,0)) AS qtyavailable, sum(ms.qtyonhand) AS qtyonhand, NVL(sum(mr.qty),0) AS qtyreserved, round(max(mpr.pricestd), 0) AS pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id, org.name AS orgname
+   			s.created, 
+   			s.createdby, 
+   			s.updated, 
+   			s.updatedby, 
+   			s.m_product_id, 
+   			s.substitute_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+	UNION 
+         SELECT r.ad_client_id, 
+         	r.ad_org_id, 
+         	r.isactive, 
+         	r.created, 
+         	r.createdby, 
+         	r.updated, 
+         	r.updatedby,
+			r.m_product_id, 
+			r.relatedproduct_id AS substitute_id, 
+			'R' AS rowtype,  
+			mp.name, 
+			sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+			sum(ms.qtyonhand) AS qtyonhand, 
+			sum(ms.qtyreserved) AS qtyreserved, 
+			ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+			mpr.m_pricelist_version_id, 
+			mw.m_warehouse_id, 
+			org.name AS orgname
            FROM m_relatedproduct r
-      JOIN m_storageonhand ms ON ms.m_product_id = r.relatedproduct_id
+      JOIN m_storage ms ON ms.m_product_id = r.relatedproduct_id
    JOIN m_product mp ON ms.m_product_id = mp.m_product_id
    JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
    JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
    JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
-   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id 
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+   GROUP BY r.ad_client_id, 
-  GROUP BY r.ad_client_id, r.ad_org_id, r.isactive, r.created, r.createdby, r.updated, r.updatedby, r.m_product_id, r.relatedproduct_id, mw.m_warehouse_id, mpr.m_pricelist_version_id, org.name, mp.name;
+   			r.ad_org_id, 
+   			r.isactive, 
+   			r.created, 
+   			r.createdby, 
+   			r.updated, 
+   			r.updatedby, 
+   			r.m_product_id, 
+   			r.relatedproduct_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name;

db/ddlutils/oracle/views/M_Storage.sql

@@ -0,0 +1,59 @@
+CREATE OR REPLACE VIEW m_storage
+AS
+  SELECT s.m_product_id,
+         s.m_locator_id,
+         s.ad_client_id,
+         s.ad_org_id,
+         s.isactive,
+         s.created,
+         s.createdby,
+         s.updated,
+         s.updatedby,
+         s.qtyonhand,
+         0 AS qtyreserved,
+         0 AS qtyordered,
+         s.datelastinventory,
+         s.m_attributesetinstance_id,
+         s.m_storageonhand_uu
+  FROM   m_storageonhand s
+  UNION
+  SELECT sr.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         sr.ad_client_id,
+         sr.ad_org_id,
+         sr.isactive,
+         sr.created,
+         sr.createdby,
+         sr.updated,
+         sr.updatedby,
+         0                     AS qtyonhand,
+         sr.qty                AS qtyreserved,
+         0                     AS qtyordered,
+         sr.datelastinventory,
+         sr.m_attributesetinstance_id,
+         sr.m_storagereservation_uu
+  FROM   m_storagereservation sr
+         JOIN m_warehouse w
+           ON sr.m_warehouse_id = w.m_warehouse_id
+  WHERE  sr.issotrx = 'Y'
+  UNION
+  SELECT so.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         so.ad_client_id,
+         so.ad_org_id,
+         so.isactive,
+         so.created,
+         so.createdby,
+         so.updated,
+         so.updatedby,
+         0                     AS qtyonhand,
+         0                     AS qtyreserved,
+         so.qty                AS qtyordered,
+         so.datelastinventory,
+         so.m_attributesetinstance_id,
+         so.m_storagereservation_uu
+  FROM   m_storagereservation so
+         JOIN m_warehouse w
+           ON so.m_warehouse_id = w.m_warehouse_id
+  WHERE  so.issotrx = 'N'
+;

db/ddlutils/oracle/views/RV_STORAGE_PER_PRODUCT.sql

@@ -0,0 +1,14 @@
+CREATE OR REPLACE VIEW rv_storage_per_product AS 
+SELECT strg.AD_Client_ID, strg.AD_Org_ID
+ , p.M_Product_ID, p.Value, p.Name
+ , p.Description, p.UPC, p.SKU
+ , p.C_UOM_ID, p.M_Product_Category_ID, p.Classification, p.Weight, p.Volume, p.VersionNo
+ , p.GuaranteeDays, p.GuaranteeDaysMin
+ , strg.SumQtyOnHand
+FROM M_Product p
+  INNER JOIN ( SELECT M_Product_ID, M_Locator_ID, SUM (QtyOnHand) as SumQtyOnHand
+                      , AD_Client_ID, AD_Org_ID
+               FROM RV_Storage
+               GROUP BY M_Product_ID, M_Locator_ID, AD_Client_ID, AD_Org_ID) strg ON (p.M_Product_ID = strg.M_Product_ID)
+  INNER JOIN M_Locator l ON (strg.M_Locator_ID=l.M_Locator_ID)
+;

db/ddlutils/postgresql/views/M_PRODUCT_STOCK_V.sql

@@ -1,8 +1,13 @@
-CREATE OR REPLACE VIEW m_product_stock_v AS 
+--create views
- SELECT ms.isactive, ms.created, ms.createdby, ms.updated, ms.updatedby, mp.value, mp.help, ms.qtyonhand - coalesce(mr.qty,0) AS qtyavailable, ms.qtyonhand, coalesce(mr.qty,0) as qtyreserved, mp.description, mw.name AS warehouse, mw.m_warehouse_id, mw.ad_client_id, mw.ad_org_id, mp.documentnote
+CREATE OR REPLACE VIEW M_PRODUCT_STOCK_V
-   FROM m_storageonhand ms
+AS
-   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+SELECT 
-   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+ms.IsActive, ms.Created, ms.CreatedBy, ms.Updated, ms.UpdatedBy,
-   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+mp.VALUE, mp.help, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, 
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+ms.qtyreserved, mp.description, mw.NAME AS warehouse, mw.m_warehouse_id, mw.ad_client_id, 
-  ORDER BY mw.name;
+mw.ad_org_id, mp.documentnote
+FROM M_STORAGE ms 
+JOIN M_PRODUCT mp ON ms.m_product_id = mp.m_product_id
+JOIN M_LOCATOR ml ON ms.m_locator_id = ml.m_locator_id
+JOIN M_WAREHOUSE mw ON ml.m_warehouse_id = mw.m_warehouse_id 
+ORDER BY mw.NAME;

db/ddlutils/postgresql/views/M_PRODUCT_SUBSTITUTERELATED_V.sql

@@ -1,22 +1,78 @@
-CREATE OR REPLACE VIEW m_product_substituterelated_v AS 
+CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS
-         SELECT s.ad_client_id, s.ad_org_id, s.isactive, s.created, s.createdby, s.updated, s.updatedby, s.m_product_id, s.substitute_id, 'S'::text AS rowtype, mp.name, sum(ms.qtyonhand - coalesce(mr.qty,0)) AS qtyavailable, sum(ms.qtyonhand) AS qtyonhand, coalesce(sum(mr.qty),0) AS qtyreserved, round(max(mpr.pricestd), 0) AS pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id, org.name AS orgname
+SELECT s.ad_client_id, 
+		s.ad_org_id, 
+		s.isactive, 
+		s.created, 
+		s.createdby, 
+		s.updated, 
+		s.updatedby,
+		s.m_product_id, 
+		s.substitute_id, 
+		'S' AS rowtype,
+		mp.name, 
+		sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+		sum(ms.qtyonhand) AS qtyonhand, 
+		sum(ms.qtyreserved) AS qtyreserved,
+		ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+		mpr.m_pricelist_version_id, 
+		mw.m_warehouse_id, 
+		org.name AS orgname
            FROM m_substitute s
-      JOIN m_storageonhand ms ON ms.m_product_id = s.substitute_id
+      JOIN m_storage ms ON ms.m_product_id = s.substitute_id
    JOIN m_product mp ON ms.m_product_id = mp.m_product_id
    JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
    JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
    JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
    JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+   GROUP BY s.ad_client_id, 
-  GROUP BY s.ad_client_id, s.ad_org_id, s.isactive, s.created, s.createdby, s.updated, s.updatedby, s.m_product_id, s.substitute_id, mw.m_warehouse_id, mpr.m_pricelist_version_id, org.name, mp.name
+   			s.ad_org_id, 
-UNION 
+   			s.isactive, 
-         SELECT r.ad_client_id, r.ad_org_id, r.isactive, r.created, r.createdby, r.updated, r.updatedby, r.m_product_id, r.relatedproduct_id AS substitute_id, 'R'::text AS rowtype, mp.name, sum(ms.qtyonhand - coalesce(mr.qty,0)) AS qtyavailable, sum(ms.qtyonhand) AS qtyonhand, coalesce(sum(mr.qty),0) AS qtyreserved, round(max(mpr.pricestd), 0) AS pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id, org.name AS orgname
+   			s.created, 
+   			s.createdby, 
+   			s.updated, 
+   			s.updatedby, 
+   			s.m_product_id, 
+   			s.substitute_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+	UNION 
+         SELECT r.ad_client_id, 
+         	r.ad_org_id, 
+         	r.isactive, 
+         	r.created, 
+         	r.createdby, 
+         	r.updated, 
+         	r.updatedby,
+			r.m_product_id, 
+			r.relatedproduct_id AS substitute_id, 
+			'R' AS rowtype,  
+			mp.name, 
+			sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+			sum(ms.qtyonhand) AS qtyonhand, 
+			sum(ms.qtyreserved) AS qtyreserved, 
+			ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+			mpr.m_pricelist_version_id, 
+			mw.m_warehouse_id, 
+			org.name AS orgname
            FROM m_relatedproduct r
-      JOIN m_storageonhand ms ON ms.m_product_id = r.relatedproduct_id
+      JOIN m_storage ms ON ms.m_product_id = r.relatedproduct_id
    JOIN m_product mp ON ms.m_product_id = mp.m_product_id
    JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
    JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
    JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
-   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id 
-   LEFT JOIN m_storagereservation mr ON ms.m_product_id = mr.m_product_id AND mw.m_warehouse_id = mr.m_warehouse_id AND mr.isSOTrx='Y'
+   GROUP BY r.ad_client_id, 
-  GROUP BY r.ad_client_id, r.ad_org_id, r.isactive, r.created, r.createdby, r.updated, r.updatedby, r.m_product_id, r.relatedproduct_id, mw.m_warehouse_id, mpr.m_pricelist_version_id, org.name, mp.name;
+   			r.ad_org_id, 
+   			r.isactive, 
+   			r.created, 
+   			r.createdby, 
+   			r.updated, 
+   			r.updatedby, 
+   			r.m_product_id, 
+   			r.relatedproduct_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name;

db/ddlutils/postgresql/views/M_Storage.sql

@@ -0,0 +1,59 @@
+CREATE OR REPLACE VIEW m_storage
+AS
+  SELECT s.m_product_id,
+         s.m_locator_id,
+         s.ad_client_id,
+         s.ad_org_id,
+         s.isactive,
+         s.created,
+         s.createdby,
+         s.updated,
+         s.updatedby,
+         s.qtyonhand,
+         0 AS qtyreserved,
+         0 AS qtyordered,
+         s.datelastinventory,
+         s.m_attributesetinstance_id,
+         s.m_storageonhand_uu
+  FROM   m_storageonhand s
+  UNION
+  SELECT sr.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         sr.ad_client_id,
+         sr.ad_org_id,
+         sr.isactive,
+         sr.created,
+         sr.createdby,
+         sr.updated,
+         sr.updatedby,
+         0                     AS qtyonhand,
+         sr.qty                AS qtyreserved,
+         0                     AS qtyordered,
+         sr.datelastinventory,
+         sr.m_attributesetinstance_id,
+         sr.m_storagereservation_uu
+  FROM   m_storagereservation sr
+         JOIN m_warehouse w
+           ON sr.m_warehouse_id = w.m_warehouse_id
+  WHERE  sr.issotrx = 'Y'
+  UNION
+  SELECT so.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         so.ad_client_id,
+         so.ad_org_id,
+         so.isactive,
+         so.created,
+         so.createdby,
+         so.updated,
+         so.updatedby,
+         0                     AS qtyonhand,
+         0                     AS qtyreserved,
+         so.qty                AS qtyordered,
+         so.datelastinventory,
+         so.m_attributesetinstance_id,
+         so.m_storagereservation_uu
+  FROM   m_storagereservation so
+         JOIN m_warehouse w
+           ON so.m_warehouse_id = w.m_warehouse_id
+  WHERE  so.issotrx = 'N'
+;

db/ddlutils/postgresql/views/RV_STORAGE_PER_PRODUCT.sql

@@ -0,0 +1,14 @@
+CREATE OR REPLACE VIEW rv_storage_per_product AS 
+SELECT strg.AD_Client_ID, strg.AD_Org_ID
+ , p.M_Product_ID, p.Value, p.Name
+ , p.Description, p.UPC, p.SKU
+ , p.C_UOM_ID, p.M_Product_Category_ID, p.Classification, p.Weight, p.Volume, p.VersionNo
+ , p.GuaranteeDays, p.GuaranteeDaysMin
+ , strg.SumQtyOnHand
+FROM M_Product p
+  INNER JOIN ( SELECT M_Product_ID, M_Locator_ID, SUM (QtyOnHand) as SumQtyOnHand
+                      , AD_Client_ID, AD_Org_ID
+               FROM RV_Storage
+               GROUP BY M_Product_ID, M_Locator_ID, AD_Client_ID, AD_Org_ID) strg ON (p.M_Product_ID = strg.M_Product_ID)
+  INNER JOIN M_Locator l ON (strg.M_Locator_ID=l.M_Locator_ID)
+;

migration/i1.0a-release/oracle/201211191100_IDEMPIERE-385_DB.sql

@@ -0,0 +1,375 @@
+-- Nov 19, 2012 10:56:55 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('M_StorageOnHand_UU',200233,'U','M_StorageOnHand_UU','M_StorageOnHand_UU','d22731f0-0762-43bf-9f29-66383f3038f8',0,TO_DATE('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Nov 19, 2012 10:56:55 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Element_Trl_UU ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200233 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',1.00,200026,200917,'U','N','N','N','N',36,'N',10,'N',200233,'66058949-db74-48a6-a940-79ee28d0f0ed','Y','N','M_StorageOnHand_UU','M_StorageOnHand_UU',TO_DATE('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200917 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+ALTER TABLE M_StorageOnHand ADD M_StorageOnHand_UU NVARCHAR2(36) DEFAULT NULL 
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+CREATE UNIQUE INDEX M_StorageOnHand_UU_idx ON m_storageonhand(M_StorageOnHand_UU)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('M_StorageReservation_UU',200234,'U','M_StorageReservation_UU','M_StorageReservation_UU','283bcf86-e8af-4ac7-aaff-efcfa104e700',0,TO_DATE('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Element_Trl_UU ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200234 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',1.00,200027,200918,'U','N','N','N','N',36,'N',10,'N',200234,'fb178aac-4ffe-4244-907c-89a0a527acf8','Y','N','M_StorageReservation_UU','M_StorageReservation_UU',TO_DATE('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200918 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+ALTER TABLE M_StorageReservation ADD M_StorageReservation_UU NVARCHAR2(36) DEFAULT NULL 
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+CREATE UNIQUE INDEX M_StorageReservation_UU_idx ON m_storagereservation(M_StorageReservation_UU)
+;
+
+ALTER TABLE m_storageonhand DROP CONSTRAINT m_storageonhand_key
+;
+
+ALTER TABLE m_storageonhand ADD (CONSTRAINT m_storageonhand_pkey PRIMARY KEY (m_product_id, m_locator_id, m_attributesetinstance_id))
+;
+
+ALTER TABLE m_storagereservation DROP CONSTRAINT m_storagereservation_key
+;
+
+ALTER TABLE m_storagereservation ADD (CONSTRAINT m_storagereservation_pkey PRIMARY KEY (m_product_id, m_warehouse_id, issotrx, m_attributesetinstance_id))
+;
+
+insert into m_storageonhand (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+m_attributesetinstance_id,
+m_locator_id,
+m_product_id,
+qtyonhand,
+updated,
+updatedby,
+m_storageonhand_uu
+)
+select ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+m_attributesetinstance_id,
+m_locator_id,
+m_product_id,
+qtyonhand,
+updated,
+updatedby,
+generate_uuid()
+from m_storage
+;
+
+insert into m_storagereservation (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+issotrx,
+m_attributesetinstance_id,
+m_product_id,
+m_warehouse_id,
+qty,
+updated,
+updatedby,
+m_storagereservation_uu
+)
+select
+min(s.ad_client_id),
+min(s.ad_org_id),
+min(s.created),
+min(s.createdby),
+null,
+'Y',
+'Y',
+s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id,
+sum(s.qtyreserved),
+max(s.updated),
+max(s.updatedby),
+generate_uuid()
+from m_storage s
+join m_locator l on (s.m_locator_id=l.m_locator_id)
+where s.isactive='Y'
+and s.qtyreserved!=0
+group by s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id
+;
+
+insert into m_storagereservation (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+issotrx,
+m_attributesetinstance_id,
+m_product_id,
+m_warehouse_id,
+qty,
+updated,
+updatedby,
+m_storagereservation_uu
+)
+select
+min(s.ad_client_id),
+min(s.ad_org_id),
+min(s.created),
+min(s.createdby),
+null,
+'Y',
+'N',
+s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id,
+sum(s.qtyordered),
+max(s.updated),
+max(s.updatedby),
+generate_uuid()
+from m_storage s
+join m_locator l on (s.m_locator_id=l.m_locator_id)
+where s.isactive='Y'
+and s.qtyordered!=0
+group by s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id
+;
+
+ALTER TABLE m_storage RENAME TO m_storage_to_drop
+;
+
+CREATE OR REPLACE VIEW m_storage
+AS
+  SELECT s.m_product_id,
+         s.m_locator_id,
+         s.ad_client_id,
+         s.ad_org_id,
+         s.isactive,
+         s.created,
+         s.createdby,
+         s.updated,
+         s.updatedby,
+         s.qtyonhand,
+         0 AS qtyreserved,
+         0 AS qtyordered,
+         s.datelastinventory,
+         s.m_attributesetinstance_id,
+         s.m_storageonhand_uu
+  FROM   m_storageonhand s
+  UNION
+  SELECT sr.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         sr.ad_client_id,
+         sr.ad_org_id,
+         sr.isactive,
+         sr.created,
+         sr.createdby,
+         sr.updated,
+         sr.updatedby,
+         0                     AS qtyonhand,
+         sr.qty                AS qtyreserved,
+         0                     AS qtyordered,
+         sr.datelastinventory,
+         sr.m_attributesetinstance_id,
+         sr.m_storagereservation_uu
+  FROM   m_storagereservation sr
+         JOIN m_warehouse w
+           ON sr.m_warehouse_id = w.m_warehouse_id
+  WHERE  sr.issotrx = 'Y'
+  UNION
+  SELECT so.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         so.ad_client_id,
+         so.ad_org_id,
+         so.isactive,
+         so.created,
+         so.createdby,
+         so.updated,
+         so.updatedby,
+         0                     AS qtyonhand,
+         0                     AS qtyreserved,
+         so.qty                AS qtyordered,
+         so.datelastinventory,
+         so.m_attributesetinstance_id,
+         so.m_storagereservation_uu
+  FROM   m_storagereservation so
+         JOIN m_warehouse w
+           ON so.m_warehouse_id = w.m_warehouse_id
+  WHERE  so.issotrx = 'N'
+;
+
+-- Comment the next if you want to preserve a backup of the M_Storage table
+DROP TABLE m_storage_to_drop
+;
+
+-- Nov 19, 2012 12:19:33 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Table SET IsView='Y',Updated=TO_DATE('2012-11-19 12:19:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=250
+;
+
+-- Nov 19, 2012 12:26:17 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Tab SET OrderByClause='M_Product_ID, M_AttributeSetInstance_ID, M_Locator_ID',Updated=TO_DATE('2012-11-19 12:26:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=179
+;
+
+-- Nov 19, 2012 12:26:42 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Tab SET OrderByClause='M_Product_ID, M_AttributeSetInstance_ID, M_Locator_ID',Updated=TO_DATE('2012-11-19 12:26:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53244
+;
+
+update m_warehouse set m_reservelocator_id = 
+(select min(m_locator_id)
+from m_locator 
+where m_warehouse_id =m_warehouse.m_warehouse_id and isactive='Y' and isdefault='Y')
+where m_reservelocator_id is null
+;
+
+-- Nov 19, 2012 1:15:02 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Column SET AD_Reference_Value_ID=191, AD_Reference_ID=18, AD_Val_Rule_ID=127, IsToolbarButton='N',Updated=TO_DATE('2012-11-19 13:15:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200704
+;
+
+--create views
+CREATE OR REPLACE VIEW M_PRODUCT_STOCK_V
+AS
+SELECT 
+ms.IsActive, ms.Created, ms.CreatedBy, ms.Updated, ms.UpdatedBy,
+mp.VALUE, mp.help, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, 
+ms.qtyreserved, mp.description, mw.NAME AS warehouse, mw.m_warehouse_id, mw.ad_client_id, 
+mw.ad_org_id, mp.documentnote
+FROM M_STORAGE ms 
+JOIN M_PRODUCT mp ON ms.m_product_id = mp.m_product_id
+JOIN M_LOCATOR ml ON ms.m_locator_id = ml.m_locator_id
+JOIN M_WAREHOUSE mw ON ml.m_warehouse_id = mw.m_warehouse_id 
+ORDER BY mw.NAME
+;
+
+CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS
+SELECT s.ad_client_id, 
+		s.ad_org_id, 
+		s.isactive, 
+		s.created, 
+		s.createdby, 
+		s.updated, 
+		s.updatedby,
+		s.m_product_id, 
+		s.substitute_id, 
+		'S' AS rowtype,
+		mp.name, 
+		sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+		sum(ms.qtyonhand) AS qtyonhand, 
+		sum(ms.qtyreserved) AS qtyreserved,
+		ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+		mpr.m_pricelist_version_id, 
+		mw.m_warehouse_id, 
+		org.name AS orgname
+           FROM m_substitute s
+      JOIN m_storage ms ON ms.m_product_id = s.substitute_id
+   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+   JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
+   GROUP BY s.ad_client_id, 
+   			s.ad_org_id, 
+   			s.isactive, 
+   			s.created, 
+   			s.createdby, 
+   			s.updated, 
+   			s.updatedby, 
+   			s.m_product_id, 
+   			s.substitute_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+	UNION 
+         SELECT r.ad_client_id, 
+         	r.ad_org_id, 
+         	r.isactive, 
+         	r.created, 
+         	r.createdby, 
+         	r.updated, 
+         	r.updatedby,
+			r.m_product_id, 
+			r.relatedproduct_id AS substitute_id, 
+			'R' AS rowtype,  
+			mp.name, 
+			sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+			sum(ms.qtyonhand) AS qtyonhand, 
+			sum(ms.qtyreserved) AS qtyreserved, 
+			ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+			mpr.m_pricelist_version_id, 
+			mw.m_warehouse_id, 
+			org.name AS orgname
+           FROM m_relatedproduct r
+      JOIN m_storage ms ON ms.m_product_id = r.relatedproduct_id
+   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+   JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id 
+   GROUP BY r.ad_client_id, 
+   			r.ad_org_id, 
+   			r.isactive, 
+   			r.created, 
+   			r.createdby, 
+   			r.updated, 
+   			r.updatedby, 
+   			r.m_product_id, 
+   			r.relatedproduct_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+;
+
+SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual
+;
+

migration/i1.0a-release/postgresql/201211191100_IDEMPIERE-385_DB.sql

@@ -0,0 +1,494 @@
+-- Nov 19, 2012 10:56:55 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('M_StorageOnHand_UU',200233,'U','M_StorageOnHand_UU','M_StorageOnHand_UU','d22731f0-0762-43bf-9f29-66383f3038f8',0,TO_TIMESTAMP('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Nov 19, 2012 10:56:55 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Element_Trl_UU ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200233 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',1.00,200026,200917,'U','N','N','N','N',36,'N',10,'N',200233,'66058949-db74-48a6-a940-79ee28d0f0ed','Y','N','M_StorageOnHand_UU','M_StorageOnHand_UU',TO_TIMESTAMP('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2012-11-19 10:56:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200917 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+ALTER TABLE M_StorageOnHand ADD COLUMN M_StorageOnHand_UU VARCHAR(36) DEFAULT NULL 
+;
+
+-- Nov 19, 2012 10:56:56 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+CREATE UNIQUE INDEX M_StorageOnHand_UU_idx ON m_storageonhand(M_StorageOnHand_UU)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('M_StorageReservation_UU',200234,'U','M_StorageReservation_UU','M_StorageReservation_UU','283bcf86-e8af-4ac7-aaff-efcfa104e700',0,TO_TIMESTAMP('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Element_Trl_UU ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200234 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES ('N',1.00,200027,200918,'U','N','N','N','N',36,'N',10,'N',200234,'fb178aac-4ffe-4244-907c-89a0a527acf8','Y','N','M_StorageReservation_UU','M_StorageReservation_UU',TO_TIMESTAMP('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2012-11-19 10:56:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200918 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+ALTER TABLE M_StorageReservation ADD COLUMN M_StorageReservation_UU VARCHAR(36) DEFAULT NULL 
+;
+
+-- Nov 19, 2012 10:56:57 AM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+CREATE UNIQUE INDEX M_StorageReservation_UU_idx ON m_storagereservation(M_StorageReservation_UU)
+;
+
+ALTER TABLE m_storageonhand DROP CONSTRAINT m_storageonhand_key
+;
+
+ALTER TABLE m_storageonhand ADD CONSTRAINT m_storageonhand_pkey PRIMARY KEY (m_product_id, m_locator_id, m_attributesetinstance_id)
+;
+
+ALTER TABLE m_storagereservation DROP CONSTRAINT m_storagereservation_key
+;
+
+ALTER TABLE m_storagereservation ADD CONSTRAINT m_storagereservation_pkey PRIMARY KEY (m_product_id, m_warehouse_id, issotrx, m_attributesetinstance_id)
+;
+
+insert into m_storageonhand (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+m_attributesetinstance_id,
+m_locator_id,
+m_product_id,
+qtyonhand,
+updated,
+updatedby,
+m_storageonhand_uu
+)
+select ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+m_attributesetinstance_id,
+m_locator_id,
+m_product_id,
+qtyonhand,
+updated,
+updatedby,
+generate_uuid()
+from m_storage
+;
+
+insert into m_storagereservation (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+issotrx,
+m_attributesetinstance_id,
+m_product_id,
+m_warehouse_id,
+qty,
+updated,
+updatedby,
+m_storagereservation_uu
+)
+select
+min(s.ad_client_id),
+min(s.ad_org_id),
+min(s.created),
+min(s.createdby),
+null,
+'Y',
+'Y',
+s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id,
+sum(s.qtyreserved),
+max(s.updated),
+max(s.updatedby),
+generate_uuid()
+from m_storage s
+join m_locator l on (s.m_locator_id=l.m_locator_id)
+where s.isactive='Y'
+and s.qtyreserved!=0
+group by s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id
+;
+
+insert into m_storagereservation (
+ad_client_id,
+ad_org_id,
+created,
+createdby,
+datelastinventory,
+isactive,
+issotrx,
+m_attributesetinstance_id,
+m_product_id,
+m_warehouse_id,
+qty,
+updated,
+updatedby,
+m_storagereservation_uu
+)
+select
+min(s.ad_client_id),
+min(s.ad_org_id),
+min(s.created),
+min(s.createdby),
+null,
+'Y',
+'N',
+s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id,
+sum(s.qtyordered),
+max(s.updated),
+max(s.updatedby),
+generate_uuid()
+from m_storage s
+join m_locator l on (s.m_locator_id=l.m_locator_id)
+where s.isactive='Y'
+and s.qtyordered!=0
+group by s.m_attributesetinstance_id,
+s.m_product_id,
+l.m_warehouse_id
+;
+
+ALTER TABLE m_storage RENAME TO m_storage_to_drop
+;
+
+CREATE OR REPLACE VIEW m_storage
+AS
+  SELECT s.m_product_id,
+         s.m_locator_id,
+         s.ad_client_id,
+         s.ad_org_id,
+         s.isactive,
+         s.created,
+         s.createdby,
+         s.updated,
+         s.updatedby,
+         s.qtyonhand,
+         0 AS qtyreserved,
+         0 AS qtyordered,
+         s.datelastinventory,
+         s.m_attributesetinstance_id,
+         s.m_storageonhand_uu
+  FROM   m_storageonhand s
+  UNION
+  SELECT sr.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         sr.ad_client_id,
+         sr.ad_org_id,
+         sr.isactive,
+         sr.created,
+         sr.createdby,
+         sr.updated,
+         sr.updatedby,
+         0                     AS qtyonhand,
+         sr.qty                AS qtyreserved,
+         0                     AS qtyordered,
+         sr.datelastinventory,
+         sr.m_attributesetinstance_id,
+         sr.m_storagereservation_uu
+  FROM   m_storagereservation sr
+         JOIN m_warehouse w
+           ON sr.m_warehouse_id = w.m_warehouse_id
+  WHERE  sr.issotrx = 'Y'
+  UNION
+  SELECT so.m_product_id,
+         w.m_reservelocator_id AS m_locator_id,
+         so.ad_client_id,
+         so.ad_org_id,
+         so.isactive,
+         so.created,
+         so.createdby,
+         so.updated,
+         so.updatedby,
+         0                     AS qtyonhand,
+         0                     AS qtyreserved,
+         so.qty                AS qtyordered,
+         so.datelastinventory,
+         so.m_attributesetinstance_id,
+         so.m_storagereservation_uu
+  FROM   m_storagereservation so
+         JOIN m_warehouse w
+           ON so.m_warehouse_id = w.m_warehouse_id
+  WHERE  so.issotrx = 'N'
+;
+
+-- PostgreSQL requires to recreate all views before dropping a table
+CREATE OR REPLACE VIEW RV_STORAGE
+(AD_CLIENT_ID, AD_ORG_ID, M_PRODUCT_ID, VALUE, NAME, 
+ DESCRIPTION, UPC, SKU, C_UOM_ID, M_PRODUCT_CATEGORY_ID, 
+ CLASSIFICATION, WEIGHT, VOLUME, VERSIONNO, GUARANTEEDAYS, 
+ GUARANTEEDAYSMIN, M_LOCATOR_ID, M_WAREHOUSE_ID, X, Y, 
+ Z, QTYONHAND, QTYRESERVED, QTYAVAILABLE, QTYORDERED, 
+ DATELASTINVENTORY, M_ATTRIBUTESETINSTANCE_ID, M_ATTRIBUTESET_ID, SERNO, LOT, 
+ M_LOT_ID, GUARANTEEDATE, SHELFLIFEDAYS, GOODFORDAYS, SHELFLIFEREMAININGPCT)
+AS 
+SELECT s.AD_Client_ID, s.AD_Org_ID,
+    -- Product
+    s.M_Product_ID, p.Value,p.Name, p.Description, p.UPC, p.SKU,
+    p.C_UOM_ID, p.M_Product_Category_ID, p.Classification, p.Weight, p.Volume, p.VersionNo,
+    p.GuaranteeDays, p.GuaranteeDaysMin,
+    --  Locator
+    s.M_Locator_ID, l.M_Warehouse_ID, l.X, l.Y, l.Z,
+    -- Storage
+    s.QtyOnHand, s.QtyReserved, s.QtyOnHand-s.QtyReserved AS QtyAvailable, 
+    s.QtyOrdered, s.DateLastInventory,
+    -- Instance
+    s.M_AttributeSetInstance_ID, asi.M_AttributeSet_ID, asi.SerNo, asi.Lot, asi.M_Lot_ID,
+    asi.GuaranteeDate,  -- see PAttributeInstance.java
+    daysBetween(asi.GuaranteeDate,getdate()) AS ShelfLifeDays,
+    daysBetween(asi.GuaranteeDate,getdate())-p.GuaranteeDaysMin AS GoodForDays,
+    CASE WHEN COALESCE(p.GuaranteeDays,0)>0 
+      THEN ROUND((daysBetween(asi.GuaranteeDate,getdate())/p.GuaranteeDays)*100,0) 
+      ELSE NULL 
+    END AS ShelfLifeRemainingPct
+FROM M_Storage s
+  INNER JOIN M_Locator l ON (s.M_Locator_ID=l.M_Locator_ID)
+  INNER JOIN M_Product p ON (s.M_Product_ID=p.M_Product_ID)
+  LEFT OUTER JOIN M_AttributeSetInstance asi ON (s.M_AttributeSetInstance_ID=asi.M_AttributeSetInstance_ID)
+;
+
+CREATE OR REPLACE VIEW rv_pp_order_receipt_issue AS 
+SELECT obl.pp_order_bomline_id,
+obl.iscritical,
+p.value,
+obl.m_product_id,
+mos.name AS productname,
+mos.m_attributesetinstance_id,
+asi.description AS instancename,
+mos.c_uom_id,
+u.name AS uomname,
+obl.qtyrequiered,
+obl.qtyreserved AS qtyreserved_order,
+mos.qtyonhand,
+mos.qtyreserved AS qtyreserved_storage,
+mos.qtyavailable,
+mos.m_locator_id,
+mos.m_warehouse_id,
+w.name AS warehousename,
+mos.qtybom,
+mos.isqtypercentage,
+mos.qtybatch,
+obl.componenttype,
+mos.qtyrequiered - obl.qtydelivered AS qtyopen,
+obl.pp_order_id
+FROM rv_pp_order_storage mos
+JOIN pp_order_bomline obl ON mos.pp_order_bomline_id = obl.pp_order_bomline_id
+JOIN m_attributesetinstance asi ON mos.m_attributesetinstance_id = asi.m_attributesetinstance_id
+JOIN c_uom u ON mos.c_uom_id = u.c_uom_id
+JOIN m_product p ON mos.m_product_id = p.m_product_id
+JOIN m_warehouse w ON mos.m_warehouse_id = w.m_warehouse_id
+;
+
+CREATE OR REPLACE VIEW rv_pp_order_storage AS 
+SELECT 
+obl.ad_client_id,
+obl.ad_org_id,
+obl.createdby,
+obl.updatedby,
+obl.updated,
+obl.created,
+obl.isactive,
+obl.pp_order_bom_id,
+obl.pp_order_bomline_id,
+obl.pp_order_id,
+obl.iscritical,
+obl.m_product_id,
+( SELECT p.name FROM m_product p WHERE p.m_product_id = o.m_product_id) AS name,
+obl.c_uom_id,
+s.qtyonhand,
+round(obl.qtyrequiered, 4) AS qtyrequiered, 
+CASE WHEN o.qtybatchs = 0 THEN 1 ELSE round(obl.qtyrequiered / o.qtybatchs, 4) END AS qtybatchsize,
+round(bomqtyreserved(obl.m_product_id,obl.m_warehouse_id, 0), 4) AS qtyreserved,
+round(bomqtyavailable(obl.m_product_id, obl.m_warehouse_id,0), 4) AS qtyavailable,
+obl.m_warehouse_id,
+obl.qtybom,
+obl.isqtypercentage,
+round(obl.qtybatch, 4) AS qtybatch,
+obl.m_attributesetinstance_id,
+l.m_locator_id,
+l.x,
+l.y,
+l.z
+FROM pp_order_bomline obl
+JOIN pp_order o ON o.pp_order_id = obl.pp_order_id
+LEFT JOIN m_storage s ON s.m_product_id = obl.m_product_id AND s.qtyonhand <> 0 AND obl.m_warehouse_id = (( SELECT ld.m_warehouse_id FROM m_locator ld WHERE s.m_locator_id = ld.m_locator_id))
+LEFT JOIN m_locator l ON l.m_locator_id = s.m_locator_id
+ORDER BY obl.m_product_id
+;
+
+CREATE OR REPLACE VIEW rv_storage_per_product AS 
+SELECT strg.AD_Client_ID, strg.AD_Org_ID
+ , p.M_Product_ID, p.Value, p.Name
+ , p.Description, p.UPC, p.SKU
+ , p.C_UOM_ID, p.M_Product_Category_ID, p.Classification, p.Weight, p.Volume, p.VersionNo
+ , p.GuaranteeDays, p.GuaranteeDaysMin
+ , strg.SumQtyOnHand
+FROM M_Product p
+  INNER JOIN ( SELECT M_Product_ID, M_Locator_ID, SUM (QtyOnHand) as SumQtyOnHand
+                      , AD_Client_ID, AD_Org_ID
+               FROM RV_Storage
+               GROUP BY M_Product_ID, M_Locator_ID, AD_Client_ID, AD_Org_ID) strg ON (p.M_Product_ID = strg.M_Product_ID)
+  INNER JOIN M_Locator l ON (strg.M_Locator_ID=l.M_Locator_ID)
+;
+
+-- Comment the next if you want to preserve a backup of the M_Storage table
+DROP TABLE m_storage_to_drop
+;
+
+-- Nov 19, 2012 12:19:33 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Table SET IsView='Y',Updated=TO_TIMESTAMP('2012-11-19 12:19:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=250
+;
+
+-- Nov 19, 2012 12:26:17 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Tab SET OrderByClause='M_Product_ID, M_AttributeSetInstance_ID, M_Locator_ID',Updated=TO_TIMESTAMP('2012-11-19 12:26:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=179
+;
+
+-- Nov 19, 2012 12:26:42 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Tab SET OrderByClause='M_Product_ID, M_AttributeSetInstance_ID, M_Locator_ID',Updated=TO_TIMESTAMP('2012-11-19 12:26:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53244
+;
+
+update m_warehouse set m_reservelocator_id = 
+(select min(m_locator_id)
+from m_locator 
+where m_warehouse_id =m_warehouse.m_warehouse_id and isactive='Y' and isdefault='Y')
+where m_reservelocator_id is null
+;
+
+-- Nov 19, 2012 1:15:02 PM COT
+-- IDEMPIERE-385 Resolve M_Storage locking and data consistency
+UPDATE AD_Column SET AD_Reference_Value_ID=191, AD_Reference_ID=18, AD_Val_Rule_ID=127, IsToolbarButton='N',Updated=TO_TIMESTAMP('2012-11-19 13:15:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200704
+;
+
+--create views
+CREATE OR REPLACE VIEW M_PRODUCT_STOCK_V
+AS
+SELECT 
+ms.IsActive, ms.Created, ms.CreatedBy, ms.Updated, ms.UpdatedBy,
+mp.VALUE, mp.help, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, 
+ms.qtyreserved, mp.description, mw.NAME AS warehouse, mw.m_warehouse_id, mw.ad_client_id, 
+mw.ad_org_id, mp.documentnote
+FROM M_STORAGE ms 
+JOIN M_PRODUCT mp ON ms.m_product_id = mp.m_product_id
+JOIN M_LOCATOR ml ON ms.m_locator_id = ml.m_locator_id
+JOIN M_WAREHOUSE mw ON ml.m_warehouse_id = mw.m_warehouse_id 
+ORDER BY mw.NAME
+;
+
+CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS
+SELECT s.ad_client_id, 
+		s.ad_org_id, 
+		s.isactive, 
+		s.created, 
+		s.createdby, 
+		s.updated, 
+		s.updatedby,
+		s.m_product_id, 
+		s.substitute_id, 
+		'S' AS rowtype,
+		mp.name, 
+		sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+		sum(ms.qtyonhand) AS qtyonhand, 
+		sum(ms.qtyreserved) AS qtyreserved,
+		ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+		mpr.m_pricelist_version_id, 
+		mw.m_warehouse_id, 
+		org.name AS orgname
+           FROM m_substitute s
+      JOIN m_storage ms ON ms.m_product_id = s.substitute_id
+   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+   JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id
+   GROUP BY s.ad_client_id, 
+   			s.ad_org_id, 
+   			s.isactive, 
+   			s.created, 
+   			s.createdby, 
+   			s.updated, 
+   			s.updatedby, 
+   			s.m_product_id, 
+   			s.substitute_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+	UNION 
+         SELECT r.ad_client_id, 
+         	r.ad_org_id, 
+         	r.isactive, 
+         	r.created, 
+         	r.createdby, 
+         	r.updated, 
+         	r.updatedby,
+			r.m_product_id, 
+			r.relatedproduct_id AS substitute_id, 
+			'R' AS rowtype,  
+			mp.name, 
+			sum(ms.qtyonhand - ms.qtyreserved) AS qtyavailable, 
+			sum(ms.qtyonhand) AS qtyonhand, 
+			sum(ms.qtyreserved) AS qtyreserved, 
+			ROUND(MAX(mpr.pricestd),0) AS pricestd, 
+			mpr.m_pricelist_version_id, 
+			mw.m_warehouse_id, 
+			org.name AS orgname
+           FROM m_relatedproduct r
+      JOIN m_storage ms ON ms.m_product_id = r.relatedproduct_id
+   JOIN m_product mp ON ms.m_product_id = mp.m_product_id
+   JOIN m_locator ml ON ms.m_locator_id = ml.m_locator_id
+   JOIN m_warehouse mw ON ml.m_warehouse_id = mw.m_warehouse_id
+   JOIN m_productprice mpr ON ms.m_product_id = mpr.m_product_id
+   JOIN ad_org org ON org.ad_org_id = mw.ad_org_id 
+   GROUP BY r.ad_client_id, 
+   			r.ad_org_id, 
+   			r.isactive, 
+   			r.created, 
+   			r.createdby, 
+   			r.updated, 
+   			r.updatedby, 
+   			r.m_product_id, 
+   			r.relatedproduct_id, 
+   			mw.m_warehouse_id, 
+   			mpr.m_pricelist_version_id, 
+   			org.name,  
+   			mp.name
+;
+
+SELECT register_migration_script('201211191100_IDEMPIERE-385_DB.sql') FROM dual
+;
+

org.adempiere.base/src/org/compiere/model/I_M_StorageOnHand.java

@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -21,8 +21,8 @@ import java.sql.Timestamp;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_StorageOnHand
- *  @author Adempiere (generated) 
+ *  @author iDempiere (generated) 
- *  @version 360LTS.015
+ *  @version Release 1.0a
  */
 public interface I_M_StorageOnHand 
 {
@@ -31,7 +31,7 @@ public interface I_M_StorageOnHand
     public static final String Table_Name = "M_StorageOnHand";
 
     /** AD_Table_ID=200026 */
-    public static final int Table_ID = MTable.getTable_ID(Table_Name);
+    public static final int Table_ID = 200026;
 
     KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
 
@@ -147,7 +147,16 @@ public interface I_M_StorageOnHand
 	  */
 	public int getM_Product_ID();
 
-	public I_M_Product getM_Product() throws RuntimeException;
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException;
+
+    /** Column name M_StorageOnHand_UU */
+    public static final String COLUMNNAME_M_StorageOnHand_UU = "M_StorageOnHand_UU";
+
+	/** Set M_StorageOnHand_UU	  */
+	public void setM_StorageOnHand_UU (String M_StorageOnHand_UU);
+
+	/** Get M_StorageOnHand_UU	  */
+	public String getM_StorageOnHand_UU();
 
     /** Column name QtyOnHand */
     public static final String COLUMNNAME_QtyOnHand = "QtyOnHand";

org.adempiere.base/src/org/compiere/model/I_M_StorageReservation.java

@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -21,8 +21,8 @@ import java.sql.Timestamp;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_StorageReservation
- *  @author Adempiere (generated) 
+ *  @author iDempiere (generated) 
- *  @version 360LTS.015
+ *  @version Release 1.0a
  */
 public interface I_M_StorageReservation 
 {
@@ -31,7 +31,7 @@ public interface I_M_StorageReservation
     public static final String Table_Name = "M_StorageReservation";
 
     /** AD_Table_ID=200027 */
-    public static final int Table_ID = MTable.getTable_ID(Table_Name);
+    public static final int Table_ID = 200027;
 
     KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
 
@@ -145,7 +145,16 @@ public interface I_M_StorageReservation
 	  */
 	public int getM_Product_ID();
 
-	public I_M_Product getM_Product() throws RuntimeException;
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException;
+
+    /** Column name M_StorageReservation_UU */
+    public static final String COLUMNNAME_M_StorageReservation_UU = "M_StorageReservation_UU";
+
+	/** Set M_StorageReservation_UU	  */
+	public void setM_StorageReservation_UU (String M_StorageReservation_UU);
+
+	/** Get M_StorageReservation_UU	  */
+	public String getM_StorageReservation_UU();
 
     /** Column name M_Warehouse_ID */
     public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID";
@@ -160,7 +169,7 @@ public interface I_M_StorageReservation
 	  */
 	public int getM_Warehouse_ID();
 
-	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
+	public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
     /** Column name Qty */
     public static final String COLUMNNAME_Qty = "Qty";

org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java

@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -24,15 +24,15 @@ import java.util.Properties;
 import org.compiere.util.Env;
 
 /** Generated Model for M_StorageOnHand
- *  @author Adempiere (generated) 
+ *  @author iDempiere (generated) 
- *  @version 360LTS.015 - $Id$ */
+ *  @version Release 1.0a - $Id$ */
 public class X_M_StorageOnHand extends PO implements I_M_StorageOnHand, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121016L;
+	private static final long serialVersionUID = 20121119L;
 
     /** Standard Constructor */
     public X_M_StorageOnHand (Properties ctx, int M_StorageOnHand_ID, String trxName)
@@ -148,9 +148,9 @@ public class X_M_StorageOnHand extends PO implements I_M_StorageOnHand, I_Persis
 		return ii.intValue();
 	}
 
-	public I_M_Product getM_Product() throws RuntimeException
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException
     {
-		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
+		return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name)
 			.getPO(getM_Product_ID(), get_TrxName());	}
 
 	/** Set Product.
@@ -176,6 +176,20 @@ public class X_M_StorageOnHand extends PO implements I_M_StorageOnHand, I_Persis
 		return ii.intValue();
 	}
 
+	/** Set M_StorageOnHand_UU.
+		@param M_StorageOnHand_UU M_StorageOnHand_UU	  */
+	public void setM_StorageOnHand_UU (String M_StorageOnHand_UU)
+	{
+		set_Value (COLUMNNAME_M_StorageOnHand_UU, M_StorageOnHand_UU);
+	}
+
+	/** Get M_StorageOnHand_UU.
+		@return M_StorageOnHand_UU	  */
+	public String getM_StorageOnHand_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_StorageOnHand_UU);
+	}
+
 	/** Set On Hand Quantity.
 		@param QtyOnHand 
 		On Hand Quantity

org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java

@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -24,15 +24,15 @@ import java.util.Properties;
 import org.compiere.util.Env;
 
 /** Generated Model for M_StorageReservation
- *  @author Adempiere (generated) 
+ *  @author iDempiere (generated) 
- *  @version 360LTS.015 - $Id$ */
+ *  @version Release 1.0a - $Id$ */
 public class X_M_StorageReservation extends PO implements I_M_StorageReservation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121016L;
+	private static final long serialVersionUID = 20121119L;
 
     /** Standard Constructor */
     public X_M_StorageReservation (Properties ctx, int M_StorageReservation_ID, String trxName)
@@ -144,9 +144,9 @@ public class X_M_StorageReservation extends PO implements I_M_StorageReservation
 		return ii.intValue();
 	}
 
-	public I_M_Product getM_Product() throws RuntimeException
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException
     {
-		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
+		return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name)
 			.getPO(getM_Product_ID(), get_TrxName());	}
 
 	/** Set Product.
@@ -172,9 +172,23 @@ public class X_M_StorageReservation extends PO implements I_M_StorageReservation
 		return ii.intValue();
 	}
 
-	public I_M_Warehouse getM_Warehouse() throws RuntimeException
+	/** Set M_StorageReservation_UU.
+		@param M_StorageReservation_UU M_StorageReservation_UU	  */
+	public void setM_StorageReservation_UU (String M_StorageReservation_UU)
+	{
+		set_Value (COLUMNNAME_M_StorageReservation_UU, M_StorageReservation_UU);
+	}
+
+	/** Get M_StorageReservation_UU.
+		@return M_StorageReservation_UU	  */
+	public String getM_StorageReservation_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_StorageReservation_UU);
+	}
+
+	public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException
     {
-		return (I_M_Warehouse)MTable.get(getCtx(), I_M_Warehouse.Table_Name)
+		return (org.compiere.model.I_M_Warehouse)MTable.get(getCtx(), org.compiere.model.I_M_Warehouse.Table_Name)
 			.getPO(getM_Warehouse_ID(), get_TrxName());	}
 
 	/** Set Warehouse.