diff --git a/db/ddlutils/oracle/views/M_Storage.sql b/db/ddlutils/oracle/views/M_Storage.sql
index bc414b8657..e360a31fc1 100644
--- a/db/ddlutils/oracle/views/M_Storage.sql
+++ b/db/ddlutils/oracle/views/M_Storage.sql
@@ -14,7 +14,7 @@ AS
          0 AS qtyordered,
          s.datelastinventory,
          s.m_attributesetinstance_id,
-         s.m_storageonhand_uu
+         s.m_storageonhand_uu AS m_storage_uu
   FROM   m_storageonhand s
   UNION
   SELECT sr.m_product_id,
@@ -31,7 +31,7 @@ AS
          0                     AS qtyordered,
          sr.datelastinventory,
          sr.m_attributesetinstance_id,
-         sr.m_storagereservation_uu
+         sr.m_storagereservation_uu AS m_storage_uu
   FROM   m_storagereservation sr
          JOIN m_warehouse w
            ON sr.m_warehouse_id = w.m_warehouse_id
@@ -51,7 +51,7 @@ AS
          so.qty                AS qtyordered,
          so.datelastinventory,
          so.m_attributesetinstance_id,
-         so.m_storagereservation_uu
+         so.m_storagereservation_uu AS m_storage_uu
   FROM   m_storagereservation so
          JOIN m_warehouse w
            ON so.m_warehouse_id = w.m_warehouse_id
diff --git a/db/ddlutils/postgresql/views/M_Storage.sql b/db/ddlutils/postgresql/views/M_Storage.sql
index bc414b8657..e360a31fc1 100644
--- a/db/ddlutils/postgresql/views/M_Storage.sql
+++ b/db/ddlutils/postgresql/views/M_Storage.sql
@@ -14,7 +14,7 @@ AS
          0 AS qtyordered,
          s.datelastinventory,
          s.m_attributesetinstance_id,
-         s.m_storageonhand_uu
+         s.m_storageonhand_uu AS m_storage_uu
   FROM   m_storageonhand s
   UNION
   SELECT sr.m_product_id,
@@ -31,7 +31,7 @@ AS
          0                     AS qtyordered,
          sr.datelastinventory,
          sr.m_attributesetinstance_id,
-         sr.m_storagereservation_uu
+         sr.m_storagereservation_uu AS m_storage_uu
   FROM   m_storagereservation sr
          JOIN m_warehouse w
            ON sr.m_warehouse_id = w.m_warehouse_id
@@ -51,7 +51,7 @@ AS
          so.qty                AS qtyordered,
          so.datelastinventory,
          so.m_attributesetinstance_id,
-         so.m_storagereservation_uu
+         so.m_storagereservation_uu AS m_storage_uu
   FROM   m_storagereservation so
          JOIN m_warehouse w
            ON so.m_warehouse_id = w.m_warehouse_id
diff --git a/migration/i1.0a-release/oracle/201212031501_IDEMPIERE-385.sql b/migration/i1.0a-release/oracle/201212031501_IDEMPIERE-385.sql
new file mode 100644
index 0000000000..5641c36965
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201212031501_IDEMPIERE-385.sql
@@ -0,0 +1,63 @@
+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 AS m_storage_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 AS m_storage_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 AS m_storage_uu
+  FROM   m_storagereservation so
+         JOIN m_warehouse w
+           ON so.m_warehouse_id = w.m_warehouse_id
+  WHERE  so.issotrx = 'N'
+;
+
+SELECT register_migration_script('201212031501_IDEMPIERE-385.sql') FROM dual
+;
+
diff --git a/migration/i1.0a-release/oracle/201212031552_IDEMPIERE-246.sql b/migration/i1.0a-release/oracle/201212031552_IDEMPIERE-246.sql
new file mode 100644
index 0000000000..cd1e062f60
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201212031552_IDEMPIERE-246.sql
@@ -0,0 +1,213 @@
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET ColumnSpan=5, SeqNo=40, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59745
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=60,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59740
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59744
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=80,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59752
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=90,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59743
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=100,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59754
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=110,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62015
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62016
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=5,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59736
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62017
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=170, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=180, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=190, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=200,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=210,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=220,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=230,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=240,Updated=TO_DATE('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61974
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=30,Updated=TO_DATE('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61976
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=40,Updated=TO_DATE('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61977
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=50, IsDisplayed='Y', XPosition=5,Updated=TO_DATE('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61975
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=5,Updated=TO_DATE('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61983
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=61973
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=61974
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=61976
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=61977
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=61975
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=61978
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=61979
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=61980
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=61981
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=61983
+;
+
+-- Dec 3, 2012 3:47:27 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DefaultValue='@$Element_PJ@=''Y''',Updated=TO_DATE('2012-12-03 15:47:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:47:33 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DefaultValue='@$Element_AY@=''Y''',Updated=TO_DATE('2012-12-03 15:47:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:47:58 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_MC@=Y',Updated=TO_DATE('2012-12-03 15:47:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Dec 3, 2012 3:48:03 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_AY@=''Y''', DefaultValue=NULL,Updated=TO_DATE('2012-12-03 15:48:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:48:06 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_PJ@=''Y''', DefaultValue=NULL,Updated=TO_DATE('2012-12-03 15:48:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:48:25 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_OT@=Y',Updated=TO_DATE('2012-12-03 15:48:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Dec 3, 2012 3:48:33 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_U1@=Y',Updated=TO_DATE('2012-12-03 15:48:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Dec 3, 2012 3:48:42 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_U1@=Y',Updated=TO_DATE('2012-12-03 15:48:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Dec 3, 2012 4:02:02 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Table SET AD_Window_ID=53149,Updated=TO_DATE('2012-12-03 16:02:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53332
+;
+
+SELECT register_migration_script('201212031552_IDEMPIERE-246.sql') FROM dual
+;
+
diff --git a/migration/i1.0a-release/postgresql/201212031501_IDEMPIERE-385.sql b/migration/i1.0a-release/postgresql/201212031501_IDEMPIERE-385.sql
new file mode 100644
index 0000000000..8ff51bc622
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201212031501_IDEMPIERE-385.sql
@@ -0,0 +1,280 @@
+ALTER VIEW m_storage RENAME TO m_storage_bad
+;
+
+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 AS m_storage_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 AS m_storage_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 AS m_storage_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)
+;
+
+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;
+
+DROP VIEW m_storage_bad
+;
+
+SELECT register_migration_script('201212031501_IDEMPIERE-385.sql') FROM dual
+;
+
diff --git a/migration/i1.0a-release/postgresql/201212031552_IDEMPIERE-246.sql b/migration/i1.0a-release/postgresql/201212031552_IDEMPIERE-246.sql
new file mode 100644
index 0000000000..32b676bfb2
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201212031552_IDEMPIERE-246.sql
@@ -0,0 +1,213 @@
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET ColumnSpan=5, SeqNo=40, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59745
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=60,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59740
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59744
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=80,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59752
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=90,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59743
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=100,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59754
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=110,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62015
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62016
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=5,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59736
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=160, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62017
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=170, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62018
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=180, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=190, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=200,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59748
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=210,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=220,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=230,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Dec 3, 2012 3:36:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=240,Updated=TO_TIMESTAMP('2012-12-03 15:36:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61974
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=30,Updated=TO_TIMESTAMP('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61976
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=40,Updated=TO_TIMESTAMP('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61977
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=50, IsDisplayed='Y', XPosition=5,Updated=TO_TIMESTAMP('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61975
+;
+
+-- Dec 3, 2012 3:38:37 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=5,Updated=TO_TIMESTAMP('2012-12-03 15:38:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=61983
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=61973
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=61974
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=61976
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=61977
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=61975
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=61978
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=61979
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=61980
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=61981
+;
+
+-- Dec 3, 2012 3:44:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=61983
+;
+
+-- Dec 3, 2012 3:47:27 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DefaultValue='@$Element_PJ@=''Y''',Updated=TO_TIMESTAMP('2012-12-03 15:47:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:47:33 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DefaultValue='@$Element_AY@=''Y''',Updated=TO_TIMESTAMP('2012-12-03 15:47:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:47:58 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_MC@=Y',Updated=TO_TIMESTAMP('2012-12-03 15:47:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59738
+;
+
+-- Dec 3, 2012 3:48:03 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_AY@=''Y''', DefaultValue=NULL,Updated=TO_TIMESTAMP('2012-12-03 15:48:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59737
+;
+
+-- Dec 3, 2012 3:48:06 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_PJ@=''Y''', DefaultValue=NULL,Updated=TO_TIMESTAMP('2012-12-03 15:48:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59755
+;
+
+-- Dec 3, 2012 3:48:25 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_OT@=Y',Updated=TO_TIMESTAMP('2012-12-03 15:48:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59757
+;
+
+-- Dec 3, 2012 3:48:33 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_U1@=Y',Updated=TO_TIMESTAMP('2012-12-03 15:48:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59758
+;
+
+-- Dec 3, 2012 3:48:42 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET DisplayLogic='@$Element_U1@=Y',Updated=TO_TIMESTAMP('2012-12-03 15:48:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=59759
+;
+
+-- Dec 3, 2012 4:02:02 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Table SET AD_Window_ID=53149,Updated=TO_TIMESTAMP('2012-12-03 16:02:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53332
+;
+
+SELECT register_migration_script('201212031552_IDEMPIERE-246.sql') FROM dual
+;
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index e35098bc93..dbe6f298e3 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -21,8 +21,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.apache.xmlcommons@default:default,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.zkoss.zk.library@default:true"/>
+<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.apache.xmlcommons@default:default,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.font.demo@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.apache.poi@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.zkoss.zk.library@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
index ce66b709f5..ca4d3bbf33 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
@@ -49,6 +49,7 @@ public class WFilenameEditor extends WEditor
 		getComponent().setButtonImage("/images/Open16.png");
 		getComponent().addEventListener(Events.ON_UPLOAD, this);
 		getComponent().getButton().setUpload("true,native");
+		getComponent().getButton().setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
 	}
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index 4a0278ff4a..b60fe5a172 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -248,6 +248,7 @@ public class WAttachment extends Window implements EventListener<Event>
 		bSave.addEventListener(Events.ON_CLICK, this);
 
 		bLoad.setImage("/images/Import24.png");
+		bLoad.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
 		bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
 		bLoad.setUpload("true");
 		bLoad.addEventListener(Events.ON_UPLOAD, this);