diff --git a/sqlj/postgresql/sqlj.ddr b/sqlj/postgresql/sqlj.ddr
index d723a5beec..0f83ad1894 100755
--- a/sqlj/postgresql/sqlj.ddr
+++ b/sqlj/postgresql/sqlj.ddr
@@ -51,143 +51,143 @@ SQLActions[ ] = {
 	
 		
 	/** Product	**/
-	CREATE OR REPLACE FUNCTION productAttribute (M_AttributeSetInstance_ID INTEGER)
+	CREATE OR REPLACE FUNCTION productAttribute (M_AttributeSetInstance_ID NUMERIC)
  	RETURNS VARCHAR
 	AS 'org.compiere.sqlj.Product.attributeName(int)'
  	LANGUAGE java VOLATILE;;
 	
-	CREATE OR REPLACE FUNCTION bomPriceLimit (M_Product_ID INTEGER, M_PriceList_Version_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomPriceLimit (M_Product_ID NUMERIC, M_PriceList_Version_ID NUMERIC)
  	RETURNS NUMERIC
 	AS 'org.compiere.sqlj.Product.bomPriceLimit(int,int)'
  	LANGUAGE java VOLATILE;;
 	
-	CREATE OR REPLACE FUNCTION bomPriceList (M_Product_ID INTEGER, M_PriceList_Version_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomPriceList (M_Product_ID NUMERIC, M_PriceList_Version_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomPriceList(int,int)'
 	LANGUAGE java VOLATILE;;
 	
-	CREATE OR REPLACE FUNCTION bomPriceStd (M_Product_ID INTEGER, M_PriceList_Version_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomPriceStd (M_Product_ID NUMERIC, M_PriceList_Version_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomPriceStd(int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyAvailable (M_Product_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyAvailable (M_Product_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyAvailable(int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyAvailable (M_Product_ID INTEGER , M_AttributeSetInstance_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyAvailable (M_Product_ID NUMERIC , M_AttributeSetInstance_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyAvailable(int,int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyOnHand (M_Product_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyOnHand (M_Product_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyOnHand(int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyOnHand (M_Product_ID INTEGER, M_AttributeSetInstance_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyOnHand (M_Product_ID NUMERIC, M_AttributeSetInstance_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyOnHand(int,int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyOrdered (M_Product_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyOrdered (M_Product_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyOrdered(int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyOrdered (M_Product_ID INTEGER, M_AttributeSetInstance_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyOrdered (M_Product_ID NUMERIC, M_AttributeSetInstance_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyOrdered(int,int,int,int)'
 	LANGUAGE java VOLATILE;
 
 
-	CREATE OR REPLACE FUNCTION bomQtyReserved (M_Product_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyReserved (M_Product_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyReserved(int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION bomQtyReserved (M_Product_ID INTEGER, M_AttributeSetInstance_ID INTEGER, M_Warehouse_ID INTEGER, M_Locator_ID INTEGER)
+	CREATE OR REPLACE FUNCTION bomQtyReserved (M_Product_ID NUMERIC, M_AttributeSetInstance_ID NUMERIC, M_Warehouse_ID NUMERIC, M_Locator_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Product.bomQtyReserved(int,int,int,int)'
 	LANGUAGE java VOLATILE;
 	
 	/** Currency **/
-	CREATE OR REPLACE FUNCTION currencyBase (Amount NUMERIC, C_CurrencyFrom_ID INTEGER, 
-    	ConversionDate TIMESTAMP WITH TIME ZONE, AD_Client_ID INTEGER, AD_Org_ID INTEGER)
+	CREATE OR REPLACE FUNCTION currencyBase (Amount NUMERIC, C_CurrencyFrom_ID NUMERIC, 
+    	ConversionDate TIMESTAMP WITH TIME ZONE, AD_Client_ID NUMERIC, AD_Org_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Currency.base(java.math.BigDecimal,int,java.sql.Timestamp,int,int)'
 	LANGUAGE java VOLATILE; 
 	
-	CREATE OR REPLACE FUNCTION currencyConvert (Amount NUMERIC, C_CurrencyFrom_ID INTEGER, C_CurrencyTo_ID INTEGER,
-        ConversionDate TIMESTAMP WITH TIME ZONE, C_ConversionType_ID INTEGER, AD_Client_ID INTEGER, AD_Org_ID INTEGER)
+	CREATE OR REPLACE FUNCTION currencyConvert (Amount NUMERIC, C_CurrencyFrom_ID NUMERIC, C_CurrencyTo_ID NUMERIC,
+        ConversionDate TIMESTAMP WITH TIME ZONE, C_ConversionType_ID NUMERIC, AD_Client_ID NUMERIC, AD_Org_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Currency.convert(java.math.BigDecimal,int,int,java.sql.Timestamp,int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION currencyRate (C_CurrencyFrom_ID INTEGER, C_CurrencyTo_ID INTEGER,
-        ConversionDate TIMESTAMP WITH TIME ZONE, C_ConversionType_ID INTEGER, AD_Client_ID INTEGER, AD_Org_ID INTEGER)
+	CREATE OR REPLACE FUNCTION currencyRate (C_CurrencyFrom_ID NUMERIC, C_CurrencyTo_ID NUMERIC,
+        ConversionDate TIMESTAMP WITH TIME ZONE, C_ConversionType_ID NUMERIC, AD_Client_ID NUMERIC, AD_Org_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Currency.rate(int,int,java.sql.Timestamp,int,int,int)'
 	LANGUAGE java VOLATILE;
 	
 	/** BPartner **/
-	CREATE OR REPLACE FUNCTION bpartnerRemitLocation (p_C_BPartner_ID INTEGER)
- 	RETURNS INTEGER
- 	AS 'org.compiere.sqlj.BPartner.remitLocation(int)'
+	CREATE OR REPLACE FUNCTION bpartnerRemitLocation (p_C_BPartner_ID NUMERIC)
+ 	RETURNS NUMERIC
+ 	AS 'int org.compiere.sqlj.BPartner.remitLocation(int)'
 	LANGUAGE java VOLATILE;
 	
 	/** Invoice **/
-	CREATE OR REPLACE FUNCTION invoiceOpen (p_C_Invoice_ID INTEGER, p_C_InvoicePaySchedule_ID INTEGER)
+	CREATE OR REPLACE FUNCTION invoiceOpen (p_C_Invoice_ID NUMERIC, p_C_InvoicePaySchedule_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Invoice.open(int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION invoicePaid (p_C_Invoice_ID INTEGER, p_C_Currency_ID INTEGER, p_MultiplierAP INTEGER)
+	CREATE OR REPLACE FUNCTION invoicePaid (p_C_Invoice_ID NUMERIC, p_C_Currency_ID NUMERIC, p_MultiplierAP NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Invoice.paid(int,int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION invoiceDiscount (p_C_Invoice_ID INTEGER, p_PayDate TIMESTAMP WITH TIME ZONE, p_C_InvoicePaySchedule_ID INTEGER)
+	CREATE OR REPLACE FUNCTION invoiceDiscount (p_C_Invoice_ID NUMERIC, p_PayDate TIMESTAMP WITH TIME ZONE, p_C_InvoicePaySchedule_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Invoice.discount(int,java.sql.Timestamp,int)'
 	LANGUAGE java VOLATILE; 
 	
 	/** Payment Term **/
-	CREATE OR REPLACE FUNCTION paymentTermDueDays (p_C_PaymentTerm_ID INTEGER, p_DocDate TIMESTAMP WITH TIME ZONE, p_PayDate TIMESTAMP WITH TIME ZONE)
+	CREATE OR REPLACE FUNCTION paymentTermDueDays (p_C_PaymentTerm_ID NUMERIC, p_DocDate TIMESTAMP WITH TIME ZONE, p_PayDate TIMESTAMP WITH TIME ZONE)
  	RETURNS INTEGER
  	AS 'org.compiere.sqlj.PaymentTerm.dueDays(int,java.sql.Timestamp,java.sql.Timestamp)'
 	LANGUAGE java VOLATILE;
 
-	CREATE OR REPLACE FUNCTION paymentTermDueDate (p_C_PaymentTerm_ID INTEGER, p_DocDate TIMESTAMP WITH TIME ZONE)
+	CREATE OR REPLACE FUNCTION paymentTermDueDate (p_C_PaymentTerm_ID NUMERIC, p_DocDate TIMESTAMP WITH TIME ZONE)
  	RETURNS TIMESTAMP WITH TIME ZONE
 	AS 'org.compiere.sqlj.PaymentTerm.dueDate(int,java.sql.Timestamp)'
  	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION paymentTermDiscount (p_Amount NUMERIC,p_C_Currency_ID INTEGER,  p_C_PaymentTerm_ID INTEGER, p_DocDate TIMESTAMP WITH TIME ZONE, p_PayDate TIMESTAMP WITH TIME ZONE)
+	CREATE OR REPLACE FUNCTION paymentTermDiscount (p_Amount NUMERIC,p_C_Currency_ID NUMERIC,  p_C_PaymentTerm_ID NUMERIC, p_DocDate TIMESTAMP WITH TIME ZONE, p_PayDate TIMESTAMP WITH TIME ZONE)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.PaymentTerm.discount(java.math.BigDecimal,int, int ,java.sql.Timestamp,java.sql.Timestamp)'
 	LANGUAGE java VOLATILE;
 	
  	/** Payment **/
-	CREATE OR REPLACE FUNCTION paymentAllocated (p_C_Payment_ID INTEGER, p_C_Currency_ID INTEGER)
+	CREATE OR REPLACE FUNCTION paymentAllocated (p_C_Payment_ID NUMERIC, p_C_Currency_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Payment.allocated(int,int)'
 	LANGUAGE java VOLATILE;
 	
-	CREATE OR REPLACE FUNCTION paymentAvailable (p_C_Payment_ID INTEGER)
+	CREATE OR REPLACE FUNCTION paymentAvailable (p_C_Payment_ID NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Payment.available(int)'
 	LANGUAGE java VOLATILE;
 	
 	/** Account **/
-	CREATE OR REPLACE FUNCTION acctBalance (p_Account_ID INTEGER, p_AmtDr NUMERIC, p_AmtCr NUMERIC)
+	CREATE OR REPLACE FUNCTION acctBalance (p_Account_ID NUMERIC, p_AmtDr NUMERIC, p_AmtCr NUMERIC)
  	RETURNS NUMERIC
  	AS 'org.compiere.sqlj.Account.balance(int,java.math.BigDecimal,java.math.BigDecimal)'
 	LANGUAGE java VOLATILE;
 	
 	/** Manufacturing e-evolution **/
-	CREATE OR REPLACE FUNCTION documentNo (p_MPC_MRP_ID INTEGER)
+	CREATE OR REPLACE FUNCTION documentNo (p_MPC_MRP_ID NUMERIC)
  	RETURNS VARCHAR
  	AS 'org.compiere.sqlj.Manufacturing.documentNo(int)'
 	LANGUAGE java VOLATILE;