diff --git a/migration/i3.1/oracle/201603031539_IDEMPIERE-3046.sql b/migration/i3.1/oracle/201603031539_IDEMPIERE-3046.sql
new file mode 100644
index 0000000000..f149c31c60
--- /dev/null
+++ b/migration/i3.1/oracle/201603031539_IDEMPIERE-3046.sql
@@ -0,0 +1,133 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3046 Add Currency Field to Cost Adjustment Window
+-- Mar 3, 2016 3:10:37 PM SGT
+UPDATE AD_SysConfig SET Value='hengsin',Updated=TO_DATE('2016-03-03 15:10:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50001
+;
+
+-- Mar 3, 2016 3:10:53 PM SGT
+UPDATE AD_SysConfig SET Value='fREX4qu2',Updated=TO_DATE('2016-03-03 15:10:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50002
+;
+
+-- Mar 3, 2016 3:11:22 PM SGT
+INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,Name,Description,Type,Code,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Val_Rule_UU) VALUES (200091,'C_Currency in accounting schema','Available currencies are based on the schemas currency.','S','C_Currency_ID in (SELECT C_Currency_ID FROM C_AcctSchema Where AD_Client_ID = @AD_Client_ID@)',0,0,'Y',TO_DATE('2016-03-03 15:11:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2016-03-03 15:11:21','YYYY-MM-DD HH24:MI:SS'),100,'U','b632eb71-14ab-498f-b956-58f549082dea')
+;
+
+-- Mar 3, 2016 3:12:38 PM SGT
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,AD_Val_Rule_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212647,0,'Currency','The Currency for this record','Indicates the Currency to be used when processing or reporting on this record',321,200091,'C_Currency_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2016-03-03 15:12:37','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2016-03-03 15:12:37','YYYY-MM-DD HH24:MI:SS'),100,193,'Y','N','U','N','N','N','Y','a10d0295-362d-42c5-a84e-5c33ae7f0fb7','Y',0,'N','N','N')
+;
+
+-- Mar 3, 2016 3:13:00 PM SGT
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212648,0,'Currency Type','Currency Conversion Rate Type','The Currency Conversion Rate Type lets you define different type of rates, e.g. Spot, Corporate and/or Sell/Buy rates.',321,'C_ConversionType_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2016-03-03 15:12:59','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2016-03-03 15:12:59','YYYY-MM-DD HH24:MI:SS'),100,2278,'Y','N','U','N','N','N','Y','94ead663-3677-4bd0-ae50-152acbb36471','Y',0,'N','N','N')
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+UPDATE AD_Column SET FKConstraintName='CConversionType_MInventory', FKConstraintType='N',Updated=TO_DATE('2016-03-03 15:13:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212648
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+ALTER TABLE M_Inventory ADD C_ConversionType_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+ALTER TABLE M_Inventory ADD CONSTRAINT CConversionType_MInventory FOREIGN KEY (C_ConversionType_ID) REFERENCES c_conversiontype(c_conversiontype_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+UPDATE AD_Column SET FKConstraintName='CCurrency_MInventory', FKConstraintType='N',Updated=TO_DATE('2016-03-03 15:13:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212647
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+ALTER TABLE M_Inventory ADD C_Currency_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+ALTER TABLE M_Inventory ADD CONSTRAINT CCurrency_MInventory FOREIGN KEY (C_Currency_ID) REFERENCES c_currency(c_currency_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Mar 3, 2016 3:14:33 PM SGT
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (204145,'Currency','The Currency for this record','Indicates the Currency to be used when processing or reporting on this record',200102,212647,'Y',0,170,0,'N','N','N','N',0,0,'Y',TO_DATE('2016-03-03 15:14:32','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2016-03-03 15:14:32','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','4db70d18-3eec-45a6-a023-b2e15ac2a075','Y',200,1,1,1,'N','N','N')
+;
+
+-- Mar 3, 2016 3:14:49 PM SGT
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (204146,'Currency Type','Currency Conversion Rate Type','The Currency Conversion Rate Type lets you define different type of rates, e.g. Spot, Corporate and/or Sell/Buy rates.',200102,212648,'Y',0,180,0,'N','N','N','N',0,0,'Y',TO_DATE('2016-03-03 15:14:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2016-03-03 15:14:48','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','2bac096b-6a89-4643-8594-4cbbbd56b829','Y',210,1,1,1,'N','N','N')
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=204145
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=204146
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=202316
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=202303
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=202305
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=202306
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=202307
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=202308
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=202309
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=202310
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=202313
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=202314
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=202315
+;
+
+update m_inventory 
+set c_currency_id = (select a.c_currency_id from c_acctschema a 
+			inner join ad_clientinfo ci on ci.c_acctschema1_id = a.c_acctschema_id 
+			and ci.ad_client_id = m_inventory.ad_client_id)
+where c_doctype_id in (select c_doctype_id from c_doctype where ad_client_id = m_inventory.ad_client_id 
+			and docsubtypeinv ='CA' and docbasetype='MMI' and isactive='Y')
+;
+
+
+
+-- IDEMPIERE-3046 Add Currency Field to Cost Adjustment Window
+-- Mar 3, 2016 3:32:39 PM SGT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2016-03-03 15:32:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212647
+;
+
+-- Mar 3, 2016 3:32:54 PM SGT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2016-03-03 15:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212648
+;
+
+-- Mar 3, 2016 3:34:51 PM SGT
+UPDATE AD_Field SET DisplayLogic='@C_Currency_ID@!@$C_Currency_ID@',Updated=TO_DATE('2016-03-03 15:34:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204146
+;
+
+SELECT register_migration_script('201603031539_IDEMPIERE-3046') FROM dual
+;
diff --git a/migration/i3.1/postgresql/201603031539_IDEMPIERE-3046.sql b/migration/i3.1/postgresql/201603031539_IDEMPIERE-3046.sql
new file mode 100644
index 0000000000..b4df6487df
--- /dev/null
+++ b/migration/i3.1/postgresql/201603031539_IDEMPIERE-3046.sql
@@ -0,0 +1,124 @@
+-- IDEMPIERE-3046 Add Currency Field to Cost Adjustment Window
+-- Mar 3, 2016 3:10:37 PM SGT
+
+-- Mar 3, 2016 3:11:22 PM SGT
+INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,Name,Description,Type,Code,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Val_Rule_UU) VALUES (200091,'C_Currency in accounting schema','Available currencies are based on the schemas currency.','S','C_Currency_ID in (SELECT C_Currency_ID FROM C_AcctSchema Where AD_Client_ID = @AD_Client_ID@)',0,0,'Y',TO_TIMESTAMP('2016-03-03 15:11:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2016-03-03 15:11:21','YYYY-MM-DD HH24:MI:SS'),100,'U','b632eb71-14ab-498f-b956-58f549082dea')
+;
+
+-- Mar 3, 2016 3:12:38 PM SGT
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,AD_Val_Rule_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212647,0,'Currency','The Currency for this record','Indicates the Currency to be used when processing or reporting on this record',321,200091,'C_Currency_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2016-03-03 15:12:37','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2016-03-03 15:12:37','YYYY-MM-DD HH24:MI:SS'),100,193,'Y','N','U','N','N','N','Y','a10d0295-362d-42c5-a84e-5c33ae7f0fb7','Y',0,'N','N','N')
+;
+
+-- Mar 3, 2016 3:13:00 PM SGT
+INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212648,0,'Currency Type','Currency Conversion Rate Type','The Currency Conversion Rate Type lets you define different type of rates, e.g. Spot, Corporate and/or Sell/Buy rates.',321,'C_ConversionType_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2016-03-03 15:12:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2016-03-03 15:12:59','YYYY-MM-DD HH24:MI:SS'),100,2278,'Y','N','U','N','N','N','Y','94ead663-3677-4bd0-ae50-152acbb36471','Y',0,'N','N','N')
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+UPDATE AD_Column SET FKConstraintName='CConversionType_MInventory', FKConstraintType='N',Updated=TO_TIMESTAMP('2016-03-03 15:13:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212648
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+ALTER TABLE M_Inventory ADD COLUMN C_ConversionType_ID NUMERIC(10) DEFAULT NULL 
+;
+
+-- Mar 3, 2016 3:13:05 PM SGT
+ALTER TABLE M_Inventory ADD CONSTRAINT CConversionType_MInventory FOREIGN KEY (C_ConversionType_ID) REFERENCES c_conversiontype(c_conversiontype_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+UPDATE AD_Column SET FKConstraintName='CCurrency_MInventory', FKConstraintType='N',Updated=TO_TIMESTAMP('2016-03-03 15:13:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212647
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+ALTER TABLE M_Inventory ADD COLUMN C_Currency_ID NUMERIC(10) DEFAULT NULL 
+;
+
+-- Mar 3, 2016 3:13:24 PM SGT
+ALTER TABLE M_Inventory ADD CONSTRAINT CCurrency_MInventory FOREIGN KEY (C_Currency_ID) REFERENCES c_currency(c_currency_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Mar 3, 2016 3:14:33 PM SGT
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (204145,'Currency','The Currency for this record','Indicates the Currency to be used when processing or reporting on this record',200102,212647,'Y',0,170,0,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2016-03-03 15:14:32','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2016-03-03 15:14:32','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','4db70d18-3eec-45a6-a023-b2e15ac2a075','Y',200,1,1,1,'N','N','N')
+;
+
+-- Mar 3, 2016 3:14:49 PM SGT
+INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (204146,'Currency Type','Currency Conversion Rate Type','The Currency Conversion Rate Type lets you define different type of rates, e.g. Spot, Corporate and/or Sell/Buy rates.',200102,212648,'Y',0,180,0,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2016-03-03 15:14:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2016-03-03 15:14:48','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','2bac096b-6a89-4643-8594-4cbbbd56b829','Y',210,1,1,1,'N','N','N')
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=204145
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=204146
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=202316
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=202303
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=202305
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=202306
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=202307
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=202308
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=202309
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=202310
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=202313
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=202314
+;
+
+-- Mar 3, 2016 3:15:23 PM SGT
+UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=202315
+;
+
+update m_inventory 
+set c_currency_id = (select a.c_currency_id from c_acctschema a 
+			inner join ad_clientinfo ci on ci.c_acctschema1_id = a.c_acctschema_id 
+			and ci.ad_client_id = m_inventory.ad_client_id)
+where c_doctype_id in (select c_doctype_id from c_doctype where ad_client_id = m_inventory.ad_client_id 
+			and docsubtypeinv ='CA' and docbasetype='MMI' and isactive='Y')
+;
+
+
+-- IDEMPIERE-3046 Add Currency Field to Cost Adjustment Window
+
+-- Mar 3, 2016 3:32:39 PM SGT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2016-03-03 15:32:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212647
+;
+
+-- Mar 3, 2016 3:32:54 PM SGT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2016-03-03 15:32:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212648
+;
+
+-- Mar 3, 2016 3:34:51 PM SGT
+UPDATE AD_Field SET DisplayLogic='@C_Currency_ID@!@$C_Currency_ID@',Updated=TO_TIMESTAMP('2016-03-03 15:34:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204146
+;
+
+SELECT register_migration_script('201603031539_IDEMPIERE-3046') FROM dual
+;
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
index 9d9329cc47..33b4a0af59 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
@@ -18,6 +18,7 @@ package org.compiere.model;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+
 import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Inventory
@@ -450,4 +451,35 @@ public interface I_M_Inventory
 	public int getUser2_ID();
 
 	public org.compiere.model.I_C_ElementValue getUser2() throws RuntimeException;
+	
+	  /** Column name C_Currency_ID */
+    public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
+
+	/** Set Currency.
+	  * The Currency for this record
+	  */
+	public void setC_Currency_ID (int C_Currency_ID);
+
+	/** Get Currency.
+	  * The Currency for this record
+	  */
+	public int getC_Currency_ID();
+
+	public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException;
+	
+	  /** Column name C_ConversionType_ID */
+    public static final String COLUMNNAME_C_ConversionType_ID = "C_ConversionType_ID";
+
+	/** Set Currency Type.
+	  * Currency Conversion Rate Type
+	  */
+	public void setC_ConversionType_ID (int C_ConversionType_ID);
+
+	/** Get Currency Type.
+	  * Currency Conversion Rate Type
+	  */
+	public int getC_ConversionType_ID();
+
+	public org.compiere.model.I_C_ConversionType getC_ConversionType() throws RuntimeException;
+
 }
diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java
index b8366dc0ca..553dde6538 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventory.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventory.java
@@ -454,6 +454,18 @@ public class MInventory extends X_M_Inventory implements DocAction
 					BigDecimal currentCost = line.getCurrentCostPrice();
 					MClient client = MClient.get(getCtx(), getAD_Client_ID());
 					MAcctSchema as = client.getAcctSchema();
+					MAcctSchema[] ass = MAcctSchema.getClientAcctSchema(getCtx(), client.get_ID());
+					
+					if (as.getC_Currency_ID() != getC_Currency_ID()) 
+					{
+						for (int i = 0; i < ass.length ; i ++)
+						{
+							MAcctSchema a =  ass[i];
+							if (a.getC_Currency_ID() ==  getC_Currency_ID()) 
+								as = a ; 
+						}
+					}
+
 					MCost cost = product.getCostingRecord(as, getAD_Org_ID(), line.getM_AttributeSetInstance_ID(), getCostingMethod());
 					if (cost != null && cost.getCurrentCostPrice().compareTo(currentCost) != 0) 
 					{
@@ -1013,16 +1025,6 @@ public class MInventory extends X_M_Inventory implements DocAction
 		return getUpdatedBy();
 	}	//	getDoc_User_ID
 	
-	/**
-	 * 	Get Document Currency
-	 *	@return C_Currency_ID
-	 */
-	public int getC_Currency_ID()
-	{
-	//	MPriceList pl = MPriceList.get(getCtx(), getM_PriceList_ID());
-	//	return pl.getC_Currency_ID();
-		return 0;
-	}	//	getC_Currency_ID
 	
 	/** Reversal Flag		*/
 	private boolean m_reversal = false;
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
index e529625c58..6793b7de95 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
@@ -21,198 +21,206 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
+
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
-/** Generated Model for M_Inventory
- *  @author iDempiere (generated) 
- *  @version Release 3.1 - $Id$ */
-public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent 
-{
+/**
+ * Generated Model for M_Inventory
+ * 
+ * @author iDempiere (generated)
+ * @version Release 3.1 - $Id$
+ */
+public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20151030L;
+	private static final long serialVersionUID = 20160303L;
 
-    /** Standard Constructor */
-    public X_M_Inventory (Properties ctx, int M_Inventory_ID, String trxName)
-    {
-      super (ctx, M_Inventory_ID, trxName);
-      /** if (M_Inventory_ID == 0)
-        {
-			setC_DocType_ID (0);
-			setDocAction (null);
-// CO
-			setDocStatus (null);
-// DR
-			setDocumentNo (null);
-			setIsApproved (false);
-			setM_Inventory_ID (0);
-			setMovementDate (new Timestamp( System.currentTimeMillis() ));
-// @#Date@
-			setPosted (false);
-			setProcessed (false);
-        } */
-    }
-
-    /** Load Constructor */
-    public X_M_Inventory (Properties ctx, ResultSet rs, String trxName)
-    {
-      super (ctx, rs, trxName);
-    }
-
-    /** AccessLevel
-      * @return 1 - Org 
-      */
-    protected int get_AccessLevel()
-    {
-      return accessLevel.intValue();
-    }
-
-    /** Load Meta Data */
-    protected POInfo initPO (Properties ctx)
-    {
-      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
-      return poi;
-    }
-
-    public String toString()
-    {
-      StringBuffer sb = new StringBuffer ("X_M_Inventory[")
-        .append(get_ID()).append("]");
-      return sb.toString();
-    }
-
-	/** Set Trx Organization.
-		@param AD_OrgTrx_ID 
-		Performing or initiating organization
-	  */
-	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID)
-	{
-		if (AD_OrgTrx_ID < 1) 
-			set_Value (COLUMNNAME_AD_OrgTrx_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
+	/** Standard Constructor */
+	public X_M_Inventory(Properties ctx, int M_Inventory_ID, String trxName) {
+		super(ctx, M_Inventory_ID, trxName);
+		/**
+		 * if (M_Inventory_ID == 0) { setC_DocType_ID (0); setDocAction (null);
+		 * // CO setDocStatus (null); // DR setDocumentNo (null); setIsApproved
+		 * (false); setM_Inventory_ID (0); setMovementDate (new Timestamp(
+		 * System.currentTimeMillis() )); // @#Date@ setPosted (false);
+		 * setProcessed (false); }
+		 */
 	}
 
-	/** Get Trx Organization.
-		@return Performing or initiating organization
-	  */
-	public int getAD_OrgTrx_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_OrgTrx_ID);
+	/** Load Constructor */
+	public X_M_Inventory(Properties ctx, ResultSet rs, String trxName) {
+		super(ctx, rs, trxName);
+	}
+
+	/**
+	 * AccessLevel
+	 * 
+	 * @return 1 - Org
+	 */
+	protected int get_AccessLevel() {
+		return accessLevel.intValue();
+	}
+
+	/** Load Meta Data */
+	protected POInfo initPO(Properties ctx) {
+		POInfo poi = POInfo.getPOInfo(ctx, Table_ID, get_TrxName());
+		return poi;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer("X_M_Inventory[").append(get_ID())
+				.append("]");
+		return sb.toString();
+	}
+
+	/**
+	 * Set Trx Organization.
+	 * 
+	 * @param AD_OrgTrx_ID
+	 *            Performing or initiating organization
+	 */
+	public void setAD_OrgTrx_ID(int AD_OrgTrx_ID) {
+		if (AD_OrgTrx_ID < 1)
+			set_Value(COLUMNNAME_AD_OrgTrx_ID, null);
+		else
+			set_Value(COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
+	}
+
+	/**
+	 * Get Trx Organization.
+	 * 
+	 * @return Performing or initiating organization
+	 */
+	public int getAD_OrgTrx_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_AD_OrgTrx_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	/** Set Approval Amount.
-		@param ApprovalAmt 
-		Document Approval Amount
-	  */
-	public void setApprovalAmt (BigDecimal ApprovalAmt)
-	{
-		set_Value (COLUMNNAME_ApprovalAmt, ApprovalAmt);
+	/**
+	 * Set Approval Amount.
+	 * 
+	 * @param ApprovalAmt
+	 *            Document Approval Amount
+	 */
+	public void setApprovalAmt(BigDecimal ApprovalAmt) {
+		set_Value(COLUMNNAME_ApprovalAmt, ApprovalAmt);
 	}
 
-	/** Get Approval Amount.
-		@return Document Approval Amount
-	  */
-	public BigDecimal getApprovalAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ApprovalAmt);
+	/**
+	 * Get Approval Amount.
+	 * 
+	 * @return Document Approval Amount
+	 */
+	public BigDecimal getApprovalAmt() {
+		BigDecimal bd = (BigDecimal) get_Value(COLUMNNAME_ApprovalAmt);
 		if (bd == null)
-			 return Env.ZERO;
+			return Env.ZERO;
 		return bd;
 	}
 
-	public org.compiere.model.I_C_Activity getC_Activity() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_Activity)MTable.get(getCtx(), org.compiere.model.I_C_Activity.Table_Name)
-			.getPO(getC_Activity_ID(), get_TrxName());	}
-
-	/** Set Activity.
-		@param C_Activity_ID 
-		Business Activity
-	  */
-	public void setC_Activity_ID (int C_Activity_ID)
-	{
-		if (C_Activity_ID < 1) 
-			set_Value (COLUMNNAME_C_Activity_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Activity_ID, Integer.valueOf(C_Activity_ID));
+	public org.compiere.model.I_C_Activity getC_Activity()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_Activity) MTable.get(getCtx(),
+				org.compiere.model.I_C_Activity.Table_Name).getPO(
+				getC_Activity_ID(), get_TrxName());
 	}
 
-	/** Get Activity.
-		@return Business Activity
-	  */
-	public int getC_Activity_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Activity_ID);
+	/**
+	 * Set Activity.
+	 * 
+	 * @param C_Activity_ID
+	 *            Business Activity
+	 */
+	public void setC_Activity_ID(int C_Activity_ID) {
+		if (C_Activity_ID < 1)
+			set_Value(COLUMNNAME_C_Activity_ID, null);
+		else
+			set_Value(COLUMNNAME_C_Activity_ID, Integer.valueOf(C_Activity_ID));
+	}
+
+	/**
+	 * Get Activity.
+	 * 
+	 * @return Business Activity
+	 */
+	public int getC_Activity_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_Activity_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Campaign getC_Campaign() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_Campaign)MTable.get(getCtx(), org.compiere.model.I_C_Campaign.Table_Name)
-			.getPO(getC_Campaign_ID(), get_TrxName());	}
-
-	/** Set Campaign.
-		@param C_Campaign_ID 
-		Marketing Campaign
-	  */
-	public void setC_Campaign_ID (int C_Campaign_ID)
-	{
-		if (C_Campaign_ID < 1) 
-			set_Value (COLUMNNAME_C_Campaign_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Campaign_ID, Integer.valueOf(C_Campaign_ID));
+	public org.compiere.model.I_C_Campaign getC_Campaign()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_Campaign) MTable.get(getCtx(),
+				org.compiere.model.I_C_Campaign.Table_Name).getPO(
+				getC_Campaign_ID(), get_TrxName());
 	}
 
-	/** Get Campaign.
-		@return Marketing Campaign
-	  */
-	public int getC_Campaign_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Campaign_ID);
+	/**
+	 * Set Campaign.
+	 * 
+	 * @param C_Campaign_ID
+	 *            Marketing Campaign
+	 */
+	public void setC_Campaign_ID(int C_Campaign_ID) {
+		if (C_Campaign_ID < 1)
+			set_Value(COLUMNNAME_C_Campaign_ID, null);
+		else
+			set_Value(COLUMNNAME_C_Campaign_ID, Integer.valueOf(C_Campaign_ID));
+	}
+
+	/**
+	 * Get Campaign.
+	 * 
+	 * @return Marketing Campaign
+	 */
+	public int getC_Campaign_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_Campaign_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
-			.getPO(getC_DocType_ID(), get_TrxName());	}
-
-	/** Set Document Type.
-		@param C_DocType_ID 
-		Document type or rules
-	  */
-	public void setC_DocType_ID (int C_DocType_ID)
-	{
-		if (C_DocType_ID < 0) 
-			set_Value (COLUMNNAME_C_DocType_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
+	public org.compiere.model.I_C_DocType getC_DocType()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_DocType) MTable.get(getCtx(),
+				org.compiere.model.I_C_DocType.Table_Name).getPO(
+				getC_DocType_ID(), get_TrxName());
 	}
 
-	/** Get Document Type.
-		@return Document type or rules
-	  */
-	public int getC_DocType_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID);
+	/**
+	 * Set Document Type.
+	 * 
+	 * @param C_DocType_ID
+	 *            Document type or rules
+	 */
+	public void setC_DocType_ID(int C_DocType_ID) {
+		if (C_DocType_ID < 0)
+			set_Value(COLUMNNAME_C_DocType_ID, null);
+		else
+			set_Value(COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
+	}
+
+	/**
+	 * Get Document Type.
+	 * 
+	 * @return Document type or rules
+	 */
+	public int getC_DocType_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_DocType_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
 	/** CostingMethod AD_Reference_ID=122 */
-	public static final int COSTINGMETHOD_AD_Reference_ID=122;
+	public static final int COSTINGMETHOD_AD_Reference_ID = 122;
 	/** Standard Costing = S */
 	public static final String COSTINGMETHOD_StandardCosting = "S";
 	/** Average PO = A */
@@ -231,71 +239,80 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 	public static final String COSTINGMETHOD_UserDefined = "U";
 	/** _ = x */
 	public static final String COSTINGMETHOD__ = "x";
-	/** Set Costing Method.
-		@param CostingMethod 
-		Indicates how Costs will be calculated
-	  */
-	public void setCostingMethod (String CostingMethod)
-	{
 
-		set_Value (COLUMNNAME_CostingMethod, CostingMethod);
+	/**
+	 * Set Costing Method.
+	 * 
+	 * @param CostingMethod
+	 *            Indicates how Costs will be calculated
+	 */
+	public void setCostingMethod(String CostingMethod) {
+
+		set_Value(COLUMNNAME_CostingMethod, CostingMethod);
 	}
 
-	/** Get Costing Method.
-		@return Indicates how Costs will be calculated
-	  */
-	public String getCostingMethod () 
-	{
-		return (String)get_Value(COLUMNNAME_CostingMethod);
+	/**
+	 * Get Costing Method.
+	 * 
+	 * @return Indicates how Costs will be calculated
+	 */
+	public String getCostingMethod() {
+		return (String) get_Value(COLUMNNAME_CostingMethod);
 	}
 
-	public org.compiere.model.I_C_Project getC_Project() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_Project)MTable.get(getCtx(), org.compiere.model.I_C_Project.Table_Name)
-			.getPO(getC_Project_ID(), get_TrxName());	}
-
-	/** Set Project.
-		@param C_Project_ID 
-		Financial Project
-	  */
-	public void setC_Project_ID (int C_Project_ID)
-	{
-		if (C_Project_ID < 1) 
-			set_Value (COLUMNNAME_C_Project_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
+	public org.compiere.model.I_C_Project getC_Project()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_Project) MTable.get(getCtx(),
+				org.compiere.model.I_C_Project.Table_Name).getPO(
+				getC_Project_ID(), get_TrxName());
 	}
 
-	/** Get Project.
-		@return Financial Project
-	  */
-	public int getC_Project_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Project_ID);
+	/**
+	 * Set Project.
+	 * 
+	 * @param C_Project_ID
+	 *            Financial Project
+	 */
+	public void setC_Project_ID(int C_Project_ID) {
+		if (C_Project_ID < 1)
+			set_Value(COLUMNNAME_C_Project_ID, null);
+		else
+			set_Value(COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
+	}
+
+	/**
+	 * Get Project.
+	 * 
+	 * @return Financial Project
+	 */
+	public int getC_Project_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_Project_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	/** Set Description.
-		@param Description 
-		Optional short description of the record
-	  */
-	public void setDescription (String Description)
-	{
-		set_Value (COLUMNNAME_Description, Description);
+	/**
+	 * Set Description.
+	 * 
+	 * @param Description
+	 *            Optional short description of the record
+	 */
+	public void setDescription(String Description) {
+		set_Value(COLUMNNAME_Description, Description);
 	}
 
-	/** Get Description.
-		@return Optional short description of the record
-	  */
-	public String getDescription () 
-	{
-		return (String)get_Value(COLUMNNAME_Description);
+	/**
+	 * Get Description.
+	 * 
+	 * @return Optional short description of the record
+	 */
+	public String getDescription() {
+		return (String) get_Value(COLUMNNAME_Description);
 	}
 
 	/** DocAction AD_Reference_ID=135 */
-	public static final int DOCACTION_AD_Reference_ID=135;
+	public static final int DOCACTION_AD_Reference_ID = 135;
 	/** Complete = CO */
 	public static final String DOCACTION_Complete = "CO";
 	/** Approve = AP */
@@ -324,26 +341,29 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 	public static final String DOCACTION_Unlock = "XL";
 	/** Wait Complete = WC */
 	public static final String DOCACTION_WaitComplete = "WC";
-	/** Set Document Action.
-		@param DocAction 
-		The targeted status of the document
-	  */
-	public void setDocAction (String DocAction)
-	{
 
-		set_Value (COLUMNNAME_DocAction, DocAction);
+	/**
+	 * Set Document Action.
+	 * 
+	 * @param DocAction
+	 *            The targeted status of the document
+	 */
+	public void setDocAction(String DocAction) {
+
+		set_Value(COLUMNNAME_DocAction, DocAction);
 	}
 
-	/** Get Document Action.
-		@return The targeted status of the document
-	  */
-	public String getDocAction () 
-	{
-		return (String)get_Value(COLUMNNAME_DocAction);
+	/**
+	 * Get Document Action.
+	 * 
+	 * @return The targeted status of the document
+	 */
+	public String getDocAction() {
+		return (String) get_Value(COLUMNNAME_DocAction);
 	}
 
 	/** DocStatus AD_Reference_ID=131 */
-	public static final int DOCSTATUS_AD_Reference_ID=131;
+	public static final int DOCSTATUS_AD_Reference_ID = 131;
 	/** Drafted = DR */
 	public static final String DOCSTATUS_Drafted = "DR";
 	/** Completed = CO */
@@ -368,384 +388,507 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 	public static final String DOCSTATUS_WaitingPayment = "WP";
 	/** Waiting Confirmation = WC */
 	public static final String DOCSTATUS_WaitingConfirmation = "WC";
-	/** Set Document Status.
-		@param DocStatus 
-		The current status of the document
-	  */
-	public void setDocStatus (String DocStatus)
-	{
 
-		set_Value (COLUMNNAME_DocStatus, DocStatus);
+	/**
+	 * Set Document Status.
+	 * 
+	 * @param DocStatus
+	 *            The current status of the document
+	 */
+	public void setDocStatus(String DocStatus) {
+
+		set_Value(COLUMNNAME_DocStatus, DocStatus);
 	}
 
-	/** Get Document Status.
-		@return The current status of the document
-	  */
-	public String getDocStatus () 
-	{
-		return (String)get_Value(COLUMNNAME_DocStatus);
+	/**
+	 * Get Document Status.
+	 * 
+	 * @return The current status of the document
+	 */
+	public String getDocStatus() {
+		return (String) get_Value(COLUMNNAME_DocStatus);
 	}
 
-	/** Set Document No.
-		@param DocumentNo 
-		Document sequence number of the document
-	  */
-	public void setDocumentNo (String DocumentNo)
-	{
-		set_Value (COLUMNNAME_DocumentNo, DocumentNo);
+	/**
+	 * Set Document No.
+	 * 
+	 * @param DocumentNo
+	 *            Document sequence number of the document
+	 */
+	public void setDocumentNo(String DocumentNo) {
+		set_Value(COLUMNNAME_DocumentNo, DocumentNo);
 	}
 
-	/** Get Document No.
-		@return Document sequence number of the document
-	  */
-	public String getDocumentNo () 
-	{
-		return (String)get_Value(COLUMNNAME_DocumentNo);
+	/**
+	 * Get Document No.
+	 * 
+	 * @return Document sequence number of the document
+	 */
+	public String getDocumentNo() {
+		return (String) get_Value(COLUMNNAME_DocumentNo);
 	}
 
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), getDocumentNo());
-    }
-
-	/** Set Generate List.
-		@param GenerateList 
-		Generate List
-	  */
-	public void setGenerateList (String GenerateList)
-	{
-		set_Value (COLUMNNAME_GenerateList, GenerateList);
+	/**
+	 * Get Record ID/ColumnName
+	 * 
+	 * @return ID/ColumnName pair
+	 */
+	public KeyNamePair getKeyNamePair() {
+		return new KeyNamePair(get_ID(), getDocumentNo());
 	}
 
-	/** Get Generate List.
-		@return Generate List
-	  */
-	public String getGenerateList () 
-	{
-		return (String)get_Value(COLUMNNAME_GenerateList);
+	/**
+	 * Set Generate List.
+	 * 
+	 * @param GenerateList
+	 *            Generate List
+	 */
+	public void setGenerateList(String GenerateList) {
+		set_Value(COLUMNNAME_GenerateList, GenerateList);
 	}
 
-	/** Set Approved.
-		@param IsApproved 
-		Indicates if this document requires approval
-	  */
-	public void setIsApproved (boolean IsApproved)
-	{
-		set_Value (COLUMNNAME_IsApproved, Boolean.valueOf(IsApproved));
+	/**
+	 * Get Generate List.
+	 * 
+	 * @return Generate List
+	 */
+	public String getGenerateList() {
+		return (String) get_Value(COLUMNNAME_GenerateList);
 	}
 
-	/** Get Approved.
-		@return Indicates if this document requires approval
-	  */
-	public boolean isApproved () 
-	{
+	/**
+	 * Set Approved.
+	 * 
+	 * @param IsApproved
+	 *            Indicates if this document requires approval
+	 */
+	public void setIsApproved(boolean IsApproved) {
+		set_Value(COLUMNNAME_IsApproved, Boolean.valueOf(IsApproved));
+	}
+
+	/**
+	 * Get Approved.
+	 * 
+	 * @return Indicates if this document requires approval
+	 */
+	public boolean isApproved() {
 		Object oo = get_Value(COLUMNNAME_IsApproved);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
+		if (oo != null) {
+			if (oo instanceof Boolean)
+				return ((Boolean) oo).booleanValue();
 			return "Y".equals(oo);
 		}
 		return false;
 	}
 
-	/** Set Phys.Inventory.
-		@param M_Inventory_ID 
-		Parameters for a Physical Inventory
-	  */
-	public void setM_Inventory_ID (int M_Inventory_ID)
-	{
-		if (M_Inventory_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Inventory_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Inventory_ID, Integer.valueOf(M_Inventory_ID));
+	/**
+	 * Set Phys.Inventory.
+	 * 
+	 * @param M_Inventory_ID
+	 *            Parameters for a Physical Inventory
+	 */
+	public void setM_Inventory_ID(int M_Inventory_ID) {
+		if (M_Inventory_ID < 1)
+			set_ValueNoCheck(COLUMNNAME_M_Inventory_ID, null);
+		else
+			set_ValueNoCheck(COLUMNNAME_M_Inventory_ID,
+					Integer.valueOf(M_Inventory_ID));
 	}
 
-	/** Get Phys.Inventory.
-		@return Parameters for a Physical Inventory
-	  */
-	public int getM_Inventory_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Inventory_ID);
+	/**
+	 * Get Phys.Inventory.
+	 * 
+	 * @return Parameters for a Physical Inventory
+	 */
+	public int getM_Inventory_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_M_Inventory_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	/** Set M_Inventory_UU.
-		@param M_Inventory_UU M_Inventory_UU	  */
-	public void setM_Inventory_UU (String M_Inventory_UU)
-	{
-		set_Value (COLUMNNAME_M_Inventory_UU, M_Inventory_UU);
+	/**
+	 * Set M_Inventory_UU.
+	 * 
+	 * @param M_Inventory_UU
+	 *            M_Inventory_UU
+	 */
+	public void setM_Inventory_UU(String M_Inventory_UU) {
+		set_Value(COLUMNNAME_M_Inventory_UU, M_Inventory_UU);
 	}
 
-	/** Get M_Inventory_UU.
-		@return M_Inventory_UU	  */
-	public String getM_Inventory_UU () 
-	{
-		return (String)get_Value(COLUMNNAME_M_Inventory_UU);
+	/**
+	 * Get M_Inventory_UU.
+	 * 
+	 * @return M_Inventory_UU
+	 */
+	public String getM_Inventory_UU() {
+		return (String) get_Value(COLUMNNAME_M_Inventory_UU);
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	/**
+	 * Set Movement Date.
+	 * 
+	 * @param MovementDate
+	 *            Date a product was moved in or out of inventory
+	 */
+	public void setMovementDate(Timestamp MovementDate) {
+		set_Value(COLUMNNAME_MovementDate, MovementDate);
 	}
 
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	/**
+	 * Get Movement Date.
+	 * 
+	 * @return Date a product was moved in or out of inventory
+	 */
+	public Timestamp getMovementDate() {
+		return (Timestamp) get_Value(COLUMNNAME_MovementDate);
 	}
 
-	public org.compiere.model.I_M_PerpetualInv getM_PerpetualInv() throws RuntimeException
-    {
-		return (org.compiere.model.I_M_PerpetualInv)MTable.get(getCtx(), org.compiere.model.I_M_PerpetualInv.Table_Name)
-			.getPO(getM_PerpetualInv_ID(), get_TrxName());	}
-
-	/** Set Perpetual Inventory.
-		@param M_PerpetualInv_ID 
-		Rules for generating physical inventory
-	  */
-	public void setM_PerpetualInv_ID (int M_PerpetualInv_ID)
-	{
-		if (M_PerpetualInv_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_PerpetualInv_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_PerpetualInv_ID, Integer.valueOf(M_PerpetualInv_ID));
+	public org.compiere.model.I_M_PerpetualInv getM_PerpetualInv()
+			throws RuntimeException {
+		return (org.compiere.model.I_M_PerpetualInv) MTable.get(getCtx(),
+				org.compiere.model.I_M_PerpetualInv.Table_Name).getPO(
+				getM_PerpetualInv_ID(), get_TrxName());
 	}
 
-	/** Get Perpetual Inventory.
-		@return Rules for generating physical inventory
-	  */
-	public int getM_PerpetualInv_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_PerpetualInv_ID);
+	/**
+	 * Set Perpetual Inventory.
+	 * 
+	 * @param M_PerpetualInv_ID
+	 *            Rules for generating physical inventory
+	 */
+	public void setM_PerpetualInv_ID(int M_PerpetualInv_ID) {
+		if (M_PerpetualInv_ID < 1)
+			set_ValueNoCheck(COLUMNNAME_M_PerpetualInv_ID, null);
+		else
+			set_ValueNoCheck(COLUMNNAME_M_PerpetualInv_ID,
+					Integer.valueOf(M_PerpetualInv_ID));
+	}
+
+	/**
+	 * Get Perpetual Inventory.
+	 * 
+	 * @return Rules for generating physical inventory
+	 */
+	public int getM_PerpetualInv_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_M_PerpetualInv_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException
-    {
-		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.
-		@param M_Warehouse_ID 
-		Storage Warehouse and Service Point
-	  */
-	public void setM_Warehouse_ID (int M_Warehouse_ID)
-	{
-		if (M_Warehouse_ID < 1) 
-			set_Value (COLUMNNAME_M_Warehouse_ID, null);
-		else 
-			set_Value (COLUMNNAME_M_Warehouse_ID, Integer.valueOf(M_Warehouse_ID));
+	public org.compiere.model.I_M_Warehouse getM_Warehouse()
+			throws RuntimeException {
+		return (org.compiere.model.I_M_Warehouse) MTable.get(getCtx(),
+				org.compiere.model.I_M_Warehouse.Table_Name).getPO(
+				getM_Warehouse_ID(), get_TrxName());
 	}
 
-	/** Get Warehouse.
-		@return Storage Warehouse and Service Point
-	  */
-	public int getM_Warehouse_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Warehouse_ID);
+	/**
+	 * Set Warehouse.
+	 * 
+	 * @param M_Warehouse_ID
+	 *            Storage Warehouse and Service Point
+	 */
+	public void setM_Warehouse_ID(int M_Warehouse_ID) {
+		if (M_Warehouse_ID < 1)
+			set_Value(COLUMNNAME_M_Warehouse_ID, null);
+		else
+			set_Value(COLUMNNAME_M_Warehouse_ID,
+					Integer.valueOf(M_Warehouse_ID));
+	}
+
+	/**
+	 * Get Warehouse.
+	 * 
+	 * @return Storage Warehouse and Service Point
+	 */
+	public int getM_Warehouse_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_M_Warehouse_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	/** Set Posted.
-		@param Posted 
-		Posting status
-	  */
-	public void setPosted (boolean Posted)
-	{
-		set_Value (COLUMNNAME_Posted, Boolean.valueOf(Posted));
+	/**
+	 * Set Posted.
+	 * 
+	 * @param Posted
+	 *            Posting status
+	 */
+	public void setPosted(boolean Posted) {
+		set_Value(COLUMNNAME_Posted, Boolean.valueOf(Posted));
 	}
 
-	/** Get Posted.
-		@return Posting status
-	  */
-	public boolean isPosted () 
-	{
+	/**
+	 * Get Posted.
+	 * 
+	 * @return Posting status
+	 */
+	public boolean isPosted() {
 		Object oo = get_Value(COLUMNNAME_Posted);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
+		if (oo != null) {
+			if (oo instanceof Boolean)
+				return ((Boolean) oo).booleanValue();
 			return "Y".equals(oo);
 		}
 		return false;
 	}
 
-	/** Set Processed.
-		@param Processed 
-		The document has been processed
-	  */
-	public void setProcessed (boolean Processed)
-	{
-		set_Value (COLUMNNAME_Processed, Boolean.valueOf(Processed));
+	/**
+	 * Set Processed.
+	 * 
+	 * @param Processed
+	 *            The document has been processed
+	 */
+	public void setProcessed(boolean Processed) {
+		set_Value(COLUMNNAME_Processed, Boolean.valueOf(Processed));
 	}
 
-	/** Get Processed.
-		@return The document has been processed
-	  */
-	public boolean isProcessed () 
-	{
+	/**
+	 * Get Processed.
+	 * 
+	 * @return The document has been processed
+	 */
+	public boolean isProcessed() {
 		Object oo = get_Value(COLUMNNAME_Processed);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
+		if (oo != null) {
+			if (oo instanceof Boolean)
+				return ((Boolean) oo).booleanValue();
 			return "Y".equals(oo);
 		}
 		return false;
 	}
 
-	/** Set Processed On.
-		@param ProcessedOn 
-		The date+time (expressed in decimal format) when the document has been processed
-	  */
-	public void setProcessedOn (BigDecimal ProcessedOn)
-	{
-		set_Value (COLUMNNAME_ProcessedOn, ProcessedOn);
+	/**
+	 * Set Processed On.
+	 * 
+	 * @param ProcessedOn
+	 *            The date+time (expressed in decimal format) when the document
+	 *            has been processed
+	 */
+	public void setProcessedOn(BigDecimal ProcessedOn) {
+		set_Value(COLUMNNAME_ProcessedOn, ProcessedOn);
 	}
 
-	/** Get Processed On.
-		@return The date+time (expressed in decimal format) when the document has been processed
-	  */
-	public BigDecimal getProcessedOn () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ProcessedOn);
+	/**
+	 * Get Processed On.
+	 * 
+	 * @return The date+time (expressed in decimal format) when the document has
+	 *         been processed
+	 */
+	public BigDecimal getProcessedOn() {
+		BigDecimal bd = (BigDecimal) get_Value(COLUMNNAME_ProcessedOn);
 		if (bd == null)
-			 return Env.ZERO;
+			return Env.ZERO;
 		return bd;
 	}
 
-	/** Set Process Now.
-		@param Processing Process Now	  */
-	public void setProcessing (boolean Processing)
-	{
-		set_Value (COLUMNNAME_Processing, Boolean.valueOf(Processing));
+	/**
+	 * Set Process Now.
+	 * 
+	 * @param Processing
+	 *            Process Now
+	 */
+	public void setProcessing(boolean Processing) {
+		set_Value(COLUMNNAME_Processing, Boolean.valueOf(Processing));
 	}
 
-	/** Get Process Now.
-		@return Process Now	  */
-	public boolean isProcessing () 
-	{
+	/**
+	 * Get Process Now.
+	 * 
+	 * @return Process Now
+	 */
+	public boolean isProcessing() {
 		Object oo = get_Value(COLUMNNAME_Processing);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
+		if (oo != null) {
+			if (oo instanceof Boolean)
+				return ((Boolean) oo).booleanValue();
 			return "Y".equals(oo);
 		}
 		return false;
 	}
 
-	public org.compiere.model.I_M_Inventory getReversal() throws RuntimeException
-    {
-		return (org.compiere.model.I_M_Inventory)MTable.get(getCtx(), org.compiere.model.I_M_Inventory.Table_Name)
-			.getPO(getReversal_ID(), get_TrxName());	}
-
-	/** Set Reversal ID.
-		@param Reversal_ID 
-		ID of document reversal
-	  */
-	public void setReversal_ID (int Reversal_ID)
-	{
-		if (Reversal_ID < 1) 
-			set_Value (COLUMNNAME_Reversal_ID, null);
-		else 
-			set_Value (COLUMNNAME_Reversal_ID, Integer.valueOf(Reversal_ID));
+	public org.compiere.model.I_M_Inventory getReversal()
+			throws RuntimeException {
+		return (org.compiere.model.I_M_Inventory) MTable.get(getCtx(),
+				org.compiere.model.I_M_Inventory.Table_Name).getPO(
+				getReversal_ID(), get_TrxName());
 	}
 
-	/** Get Reversal ID.
-		@return ID of document reversal
-	  */
-	public int getReversal_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Reversal_ID);
+	/**
+	 * Set Reversal ID.
+	 * 
+	 * @param Reversal_ID
+	 *            ID of document reversal
+	 */
+	public void setReversal_ID(int Reversal_ID) {
+		if (Reversal_ID < 1)
+			set_Value(COLUMNNAME_Reversal_ID, null);
+		else
+			set_Value(COLUMNNAME_Reversal_ID, Integer.valueOf(Reversal_ID));
+	}
+
+	/**
+	 * Get Reversal ID.
+	 * 
+	 * @return ID of document reversal
+	 */
+	public int getReversal_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_Reversal_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	/** Set Update Quantities.
-		@param UpdateQty Update Quantities	  */
-	public void setUpdateQty (String UpdateQty)
-	{
-		set_Value (COLUMNNAME_UpdateQty, UpdateQty);
+	/**
+	 * Set Update Quantities.
+	 * 
+	 * @param UpdateQty
+	 *            Update Quantities
+	 */
+	public void setUpdateQty(String UpdateQty) {
+		set_Value(COLUMNNAME_UpdateQty, UpdateQty);
 	}
 
-	/** Get Update Quantities.
-		@return Update Quantities	  */
-	public String getUpdateQty () 
-	{
-		return (String)get_Value(COLUMNNAME_UpdateQty);
+	/**
+	 * Get Update Quantities.
+	 * 
+	 * @return Update Quantities
+	 */
+	public String getUpdateQty() {
+		return (String) get_Value(COLUMNNAME_UpdateQty);
 	}
 
-	public org.compiere.model.I_C_ElementValue getUser1() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_ElementValue)MTable.get(getCtx(), org.compiere.model.I_C_ElementValue.Table_Name)
-			.getPO(getUser1_ID(), get_TrxName());	}
-
-	/** Set User Element List 1.
-		@param User1_ID 
-		User defined list element #1
-	  */
-	public void setUser1_ID (int User1_ID)
-	{
-		if (User1_ID < 1) 
-			set_Value (COLUMNNAME_User1_ID, null);
-		else 
-			set_Value (COLUMNNAME_User1_ID, Integer.valueOf(User1_ID));
+	public org.compiere.model.I_C_ElementValue getUser1()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_ElementValue) MTable.get(getCtx(),
+				org.compiere.model.I_C_ElementValue.Table_Name).getPO(
+				getUser1_ID(), get_TrxName());
 	}
 
-	/** Get User Element List 1.
-		@return User defined list element #1
-	  */
-	public int getUser1_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_User1_ID);
+	/**
+	 * Set User Element List 1.
+	 * 
+	 * @param User1_ID
+	 *            User defined list element #1
+	 */
+	public void setUser1_ID(int User1_ID) {
+		if (User1_ID < 1)
+			set_Value(COLUMNNAME_User1_ID, null);
+		else
+			set_Value(COLUMNNAME_User1_ID, Integer.valueOf(User1_ID));
+	}
+
+	/**
+	 * Get User Element List 1.
+	 * 
+	 * @return User defined list element #1
+	 */
+	public int getUser1_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_User1_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_ElementValue getUser2() throws RuntimeException
-    {
-		return (org.compiere.model.I_C_ElementValue)MTable.get(getCtx(), org.compiere.model.I_C_ElementValue.Table_Name)
-			.getPO(getUser2_ID(), get_TrxName());	}
-
-	/** Set User Element List 2.
-		@param User2_ID 
-		User defined list element #2
-	  */
-	public void setUser2_ID (int User2_ID)
-	{
-		if (User2_ID < 1) 
-			set_Value (COLUMNNAME_User2_ID, null);
-		else 
-			set_Value (COLUMNNAME_User2_ID, Integer.valueOf(User2_ID));
+	public org.compiere.model.I_C_ElementValue getUser2()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_ElementValue) MTable.get(getCtx(),
+				org.compiere.model.I_C_ElementValue.Table_Name).getPO(
+				getUser2_ID(), get_TrxName());
 	}
 
-	/** Get User Element List 2.
-		@return User defined list element #2
-	  */
-	public int getUser2_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_User2_ID);
+	/**
+	 * Set User Element List 2.
+	 * 
+	 * @param User2_ID
+	 *            User defined list element #2
+	 */
+	public void setUser2_ID(int User2_ID) {
+		if (User2_ID < 1)
+			set_Value(COLUMNNAME_User2_ID, null);
+		else
+			set_Value(COLUMNNAME_User2_ID, Integer.valueOf(User2_ID));
+	}
+
+	/**
+	 * Get User Element List 2.
+	 * 
+	 * @return User defined list element #2
+	 */
+	public int getUser2_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_User2_ID);
 		if (ii == null)
-			 return 0;
+			return 0;
 		return ii.intValue();
 	}
+
+	public org.compiere.model.I_C_Currency getC_Currency()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_Currency) MTable.get(getCtx(),
+				org.compiere.model.I_C_Currency.Table_Name).getPO(
+				getC_Currency_ID(), get_TrxName());
+	}
+
+	/**
+	 * Set Currency.
+	 * 
+	 * @param C_Currency_ID
+	 *            The Currency for this record
+	 */
+	public void setC_Currency_ID(int C_Currency_ID) {
+		if (C_Currency_ID < 1)
+			set_ValueNoCheck(COLUMNNAME_C_Currency_ID, null);
+		else
+			set_ValueNoCheck(COLUMNNAME_C_Currency_ID,
+					Integer.valueOf(C_Currency_ID));
+	}
+
+	/**
+	 * Get Currency.
+	 * 
+	 * @return The Currency for this record
+	 */
+	public int getC_Currency_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_Currency_ID);
+		if (ii == null)
+			return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_C_ConversionType getC_ConversionType()
+			throws RuntimeException {
+		return (org.compiere.model.I_C_ConversionType) MTable.get(getCtx(),
+				org.compiere.model.I_C_ConversionType.Table_Name).getPO(
+				getC_ConversionType_ID(), get_TrxName());
+	}
+
+	/**
+	 * Set Currency Type.
+	 * 
+	 * @param C_ConversionType_ID
+	 *            Currency Conversion Rate Type
+	 */
+	public void setC_ConversionType_ID(int C_ConversionType_ID) {
+		if (C_ConversionType_ID < 1)
+			set_Value(COLUMNNAME_C_ConversionType_ID, null);
+		else
+			set_Value(COLUMNNAME_C_ConversionType_ID,
+					Integer.valueOf(C_ConversionType_ID));
+	}
+
+	/**
+	 * Get Currency Type.
+	 * 
+	 * @return Currency Conversion Rate Type
+	 */
+	public int getC_ConversionType_ID() {
+		Integer ii = (Integer) get_Value(COLUMNNAME_C_ConversionType_ID);
+		if (ii == null)
+			return 0;
+		return ii.intValue();
+	}
+
 }
\ No newline at end of file