diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java
index 9a9f7b2ffd..d704367e27 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java
@@ -47,7 +47,7 @@ public class MBPartner extends X_C_BPartner
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -803727877324075871L;
+	private static final long serialVersionUID = -3098526308112073395L;
 
 	/**
 	 * 	Get Empty Template Business Partner
@@ -308,24 +308,24 @@ public class MBPartner extends X_C_BPartner
 	
 	
 	/** Users							*/
-	private MUser[]					m_contacts = null;
+	protected MUser[]				m_contacts = null;
 	/** Addressed						*/
-	private MBPartnerLocation[]		m_locations = null;
+	protected MBPartnerLocation[]	m_locations = null;
 	/** BP Bank Accounts				*/
-	private MBPBankAccount[]		m_accounts = null;
+	protected MBPBankAccount[]		m_accounts = null;
 	/** Prim Address					*/
-	private Integer					m_primaryC_BPartner_Location_ID = null;
+	protected Integer				m_primaryC_BPartner_Location_ID = null;
 	/** Prim User						*/
-	private Integer					m_primaryAD_User_ID = null;
+	protected Integer				m_primaryAD_User_ID = null;
 	/** BP Group						*/
-	private MBPGroup				m_group = null;
+	protected MBPGroup				m_group = null;
 	
 	/**
 	 * 	Load Default BPartner
 	 * 	@param AD_Client_ID client
 	 * 	@return true if loaded
 	 */
-	private boolean initTemplate (int AD_Client_ID)
+	protected boolean initTemplate (int AD_Client_ID)
 	{
 		if (AD_Client_ID == 0)
 			throw new IllegalArgumentException ("Client_ID=0");
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatement.java b/org.adempiere.base/src/org/compiere/model/MBankStatement.java
index 7f1bf5e5e9..cebdf7a44d 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatement.java
@@ -52,7 +52,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -859925588789443186L;
+	private static final long serialVersionUID = 4286511528899179483L;
 
 	/**
 	 * 	Standard Constructor
@@ -117,7 +117,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	}	//	MBankStatement
  
 	/**	Lines							*/
-	private MBankStatementLine[] 	m_lines = null;
+	protected MBankStatementLine[] m_lines = null;
 	
  	/**
  	 * 	Get Bank Statement Lines
@@ -265,9 +265,9 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
index 91447408f6..e66961856a 100644
--- a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
@@ -44,7 +44,7 @@ import org.compiere.util.Msg;
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1914411222159254809L;
+	private static final long serialVersionUID = 3809130336412385420L;
 
 	/**
 	 * 	Standard Constructor
@@ -210,7 +210,7 @@ import org.compiere.util.Msg;
 	}	//	beforeSave
 	
 	/** Parent					*/
-	private MBankStatement			m_parent = null;
+	protected MBankStatement m_parent = null;
 	
 	/**
 	 * 	Get Parent
@@ -251,7 +251,7 @@ import org.compiere.util.Msg;
 	/**
 	 * 	Update Header
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		StringBuilder sql = new StringBuilder("UPDATE C_BankStatement bs")
 			.append(" SET StatementDifference=(SELECT COALESCE(SUM(StmtAmt),0) FROM C_BankStatementLine bsl ")
diff --git a/org.adempiere.base/src/org/compiere/model/MCash.java b/org.adempiere.base/src/org/compiere/model/MCash.java
index 289be65292..501fc0a77a 100644
--- a/org.adempiere.base/src/org/compiere/model/MCash.java
+++ b/org.adempiere.base/src/org/compiere/model/MCash.java
@@ -54,7 +54,7 @@ public class MCash extends X_C_Cash implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1221144207418749593L;
+	private static final long serialVersionUID = -7632011237765946083L;
 
 
 	/**
@@ -203,9 +203,9 @@ public class MCash extends X_C_Cash implements DocAction
 	}	//	MCash
 	
 	/**	Lines					*/
-	private MCashLine[]		m_lines = null;
+	protected MCashLine[]		m_lines = null;
 	/** CashBook				*/
-	private MCashBook		m_book = null;
+	protected MCashBook		m_book = null;
 	
 	/**
 	 * 	Get Lines
@@ -324,9 +324,9 @@ public class MCash extends X_C_Cash implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -593,7 +593,7 @@ public class MCash extends X_C_Cash implements DocAction
 	 * 	Period needs to be open
 	 *	@return true if reversed
 	 */
-	private boolean reverseIt() 
+	protected boolean reverseIt() 
 	{
 		if (DOCSTATUS_Closed.equals(getDocStatus())
 			|| DOCSTATUS_Reversed.equals(getDocStatus())
diff --git a/org.adempiere.base/src/org/compiere/model/MCashLine.java b/org.adempiere.base/src/org/compiere/model/MCashLine.java
index 089492f502..e98eaccff8 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashLine.java
@@ -42,7 +42,7 @@ public class MCashLine extends X_C_CashLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2962077554051498950L;
+	private static final long serialVersionUID = 5023249596033465923L;
 
 
 	/**
@@ -90,13 +90,13 @@ public class MCashLine extends X_C_CashLine
 	}	//	MCashLine
 
 	/** Parent					*/
-	private MCash			m_parent = null;
+	protected MCash		m_parent = null;
 	/** Cash Book				*/
-	private MCashBook 		m_cashBook = null;
+	protected MCashBook 	m_cashBook = null;
 	/** Bank Account			*/
-	private MBankAccount 	m_bankAccount = null;
+	protected MBankAccount 	m_bankAccount = null;
 	/** Invoice					*/
-	private MInvoice		m_invoice = null;
+	protected MInvoice		m_invoice = null;
 	
 
 	/**
@@ -395,7 +395,7 @@ public class MCashLine extends X_C_CashLine
 	 * 	Statement Difference, Ending Balance
 	 *	@return true if success
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		String sql = "UPDATE C_Cash c"
 			+ " SET StatementDifference="
diff --git a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
index 5a4eb39386..046e8a8f39 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
@@ -32,7 +32,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3897658515979106674L;
+	private static final long serialVersionUID = -5535407146793681944L;
 
 	/**	Logger			*/
 	@SuppressWarnings("unused")
@@ -110,7 +110,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
 	 *	Update Header
 	 *	@return true if header updated
 	 */
-	private boolean updateHeader()
+	protected boolean updateHeader()
 	{
 		//	Update Cash Plan Header
 		StringBuilder sql = new StringBuilder("UPDATE C_CashPlan ")
diff --git a/org.adempiere.base/src/org/compiere/model/MCost.java b/org.adempiere.base/src/org/compiere/model/MCost.java
index e99068a6bb..934e0900c9 100644
--- a/org.adempiere.base/src/org/compiere/model/MCost.java
+++ b/org.adempiere.base/src/org/compiere/model/MCost.java
@@ -59,7 +59,7 @@ public class MCost extends X_M_Cost
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -8904980122276406878L;
+	private static final long serialVersionUID = -9054858267574839079L;
 
 	/**
 	 * 	Retrieve/Calculate Current Cost Price
@@ -123,7 +123,7 @@ public class MCost extends X_M_Cost
 	 *	@param trxName trx
 	 *	@return cost price or null
 	 */
-	private static BigDecimal getCurrentCost (MProduct product, int M_ASI_ID,
+	protected static BigDecimal getCurrentCost (MProduct product, int M_ASI_ID,
 		MAcctSchema as, int Org_ID, int M_CostType_ID,
 		String costingMethod, BigDecimal qty, int C_OrderLine_ID,
 		boolean zeroCostsOK, String trxName)
@@ -420,7 +420,7 @@ public class MCost extends X_M_Cost
 	}	//	getSeedCosts
 
 
-	private static BigDecimal getSeedCostFromPriceList(MProduct product,
+	protected static BigDecimal getSeedCostFromPriceList(MProduct product,
 			MAcctSchema as, int orgID) {
 		String sql = "SELECT pp.PriceList, pp.PriceStd FROM M_ProductPrice pp" +
 				" INNER JOIN M_PriceList_Version plv ON (pp.M_PriceList_Version_ID = plv.M_PriceList_Version_ID AND plv.ValidFrom <= trunc(sysdate))" +
@@ -1485,7 +1485,7 @@ public class MCost extends X_M_Cost
 	}	//	MCost
 
 	/** Data is entered Manually		*/
-	private boolean m_manual = true;
+	protected boolean m_manual = true;
 
 	/**
 	 * 	Add Cumulative Amt/Qty and Current Qty
@@ -1571,7 +1571,7 @@ public class MCost extends X_M_Cost
 	 * 	Get Costing Precision
 	 *	@return precision (6)
 	 */
-	private int getPrecision()
+	protected int getPrecision()
 	{
 		MAcctSchema as = MAcctSchema.get(getCtx(), getC_AcctSchema_ID());
 		if (as != null)
diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
index 5c0f126e4d..c110089c44 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
@@ -50,9 +50,9 @@ public class MCostDetail extends X_M_CostDetail
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -448632684360931078L;
+	private static final long serialVersionUID = -3896161579785627935L;
 
-	private static final String INOUTLINE_DOCBASETYPE_SQL =
+	protected static final String INOUTLINE_DOCBASETYPE_SQL =
 		    "SELECT c.DocBaseType From M_InOut io " +
 			"INNER JOIN M_InOutLine iol ON io.M_InOut_ID=iol.M_InOut_ID " +
 			"INNER JOIN C_DocType c ON io.C_DocType_ID=c.C_DocType_ID " +
@@ -982,7 +982,7 @@ public class MCostDetail extends X_M_CostDetail
 	 *	@param M_ASI_ID - asi corrected for costing level
 	 *	@return true if cost ok
 	 */
-	private boolean process (MAcctSchema as, MProduct product, MCostElement ce, 
+	protected boolean process (MAcctSchema as, MProduct product, MCostElement ce, 
 		int Org_ID, int M_ASI_ID)
 	{
 		//handle compatibility issue between average invoice and average po
diff --git a/org.adempiere.base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java
index 4c66911436..a6b840a5cd 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostElement.java
@@ -44,7 +44,7 @@ public class MCostElement extends X_M_CostElement
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3196322266971717530L;
+	private static final long serialVersionUID = 3423495977508725440L;
 
 
 	/**
@@ -232,7 +232,7 @@ public class MCostElement extends X_M_CostElement
 	}	
 
 	/**	Cache						*/
-	private static CCache<Integer,MCostElement>	s_cache	= new CCache<Integer,MCostElement>(Table_Name, 20);
+	protected static CCache<Integer,MCostElement>	s_cache	= new CCache<Integer,MCostElement>(Table_Name, 20);
 	
 	/**	Logger	*/
 	private static CLogger	s_log	= CLogger.getCLogger (MCostElement.class);
diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java
index 9260da7dd7..741788d345 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventory.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventory.java
@@ -54,7 +54,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2155186682727239214L;
+	private static final long serialVersionUID = 4395759120481570701L;
 	/** Reversal Indicator			*/
 	public static String	REVERSE_INDICATOR = "^";
 	
@@ -77,7 +77,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	} //	get
 
 	/**	Cache						*/
-	private static CCache<Integer,MInventory> s_cache = new CCache<Integer,MInventory>(Table_Name, 5, 5);
+	protected static CCache<Integer,MInventory> s_cache = new CCache<Integer,MInventory>(Table_Name, 5, 5);
 
 
 	/**
@@ -138,7 +138,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	
 	
 	/**	Lines						*/
-	private MInventoryLine[]	m_lines = null;
+	protected MInventoryLine[]	m_lines = null;
 	
 	/**
 	 * 	Get Lines
@@ -290,9 +290,9 @@ public class MInventory extends X_M_Inventory implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -656,7 +656,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setMovementDate(TimeUtil.getDay(0));
@@ -672,7 +672,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	/**
 	 * 	Check Material Policy.
 	 */
-	private void checkMaterialPolicy(MInventoryLine line, BigDecimal qtyDiff)
+	protected void checkMaterialPolicy(MInventoryLine line, BigDecimal qtyDiff)
 	{	
 		
 		int no = MInventoryLineMA.deleteInventoryLineMA(line.getM_InventoryLine_ID(), get_TrxName());
@@ -944,7 +944,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 		return true;
 	}	//	reverseCorrectIt
 
-	private MInventory reverse(boolean accrual) {
+	protected MInventory reverse(boolean accrual) {
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
 			reversalDate = new Timestamp(System.currentTimeMillis());
@@ -1113,13 +1113,13 @@ public class MInventory extends X_M_Inventory implements DocAction
 	
 	
 	/** Reversal Flag		*/
-	private boolean m_reversal = false;
+	protected boolean m_reversal = false;
 	
 	/**
 	 * 	Set Reversal
 	 *	@param reversal reversal
 	 */
-	private void setReversal(boolean reversal)
+	protected void setReversal(boolean reversal)
 	{
 		m_reversal = reversal;
 	}	//	setReversal
@@ -1127,7 +1127,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 	 * 	Is Reversal
 	 *	@return reversal
 	 */
-	private boolean isReversal()
+	protected boolean isReversal()
 	{
 		return m_reversal;
 	}	//	isReversal
diff --git a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
index c56dd88947..bb7f4b60d3 100644
--- a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
@@ -40,7 +40,7 @@ public class MInventoryLine extends X_M_InventoryLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3864175464877913555L;
+	private static final long serialVersionUID = 7083622834698840042L;
 
 	/**
 	 * 	Get Inventory Line with parameters
@@ -137,11 +137,11 @@ public class MInventoryLine extends X_M_InventoryLine
 	}
 	
 	/** Manually created				*/
-	// private boolean 	m_isManualEntry = true;
+	//protected boolean 	m_isManualEntry = true;
 	/** Parent							*/
-	private MInventory 	m_parent = null;
+	protected MInventory 	m_parent = null;
 	/** Product							*/
-	private MProduct 	m_product = null;
+	protected MProduct 	m_product = null;
 	
 	/**
 	 * 	Get Product
@@ -388,7 +388,7 @@ public class MInventoryLine extends X_M_InventoryLine
 	/**
 	 * 	Create Material Allocations for new Instances
 	 */
-	/*private void createMA()
+	/*protected void createMA()
 	{
 		MStorageOnHand[] storages = MStorageOnHand.getAll(getCtx(), getM_Product_ID(), 
 			getM_Locator_ID(), get_TrxName());
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
index eddde90d68..586eb649a1 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
@@ -51,7 +51,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -6174490999732876285L;
+	private static final long serialVersionUID = -1590896898028805978L;
 
 	/**
 	 * 	Get Invoice Line referencing InOut Line
@@ -101,10 +101,10 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	}
 
 	/**	Static Logger	*/
-	private static CLogger	s_log	= CLogger.getCLogger (MInvoiceLine.class);
+	protected static CLogger	s_log	= CLogger.getCLogger (MInvoiceLine.class);
 
 	/** Tax							*/
-	private MTax 		m_tax = null;
+	protected MTax 		m_tax = null;
 	
 	
 	/**************************************************************************
@@ -159,24 +159,24 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		super(ctx, rs, trxName);
 	}	//	MInvoiceLine
 
-	private int			m_M_PriceList_ID = 0;
-	private Timestamp	m_DateInvoiced = null;
-	private int			m_C_BPartner_ID = 0;
-	private int			m_C_BPartner_Location_ID = 0;
-	private boolean		m_IsSOTrx = true;
-	private boolean		m_priceSet = false;
-	private MProduct	m_product = null;
+	protected int			m_M_PriceList_ID = 0;
+	protected Timestamp	m_DateInvoiced = null;
+	protected int			m_C_BPartner_ID = 0;
+	protected int			m_C_BPartner_Location_ID = 0;
+	protected boolean		m_IsSOTrx = true;
+	protected boolean		m_priceSet = false;
+	protected MProduct	m_product = null;
 	/**	Charge					*/
-	private MCharge 		m_charge = null;
+	protected MCharge 		m_charge = null;
 	
 	/**	Cached Name of the line		*/
-	private String		m_name = null;
+	protected String		m_name = null;
 	/** Cached Precision			*/
-	private Integer		m_precision = null;
+	protected Integer		m_precision = null;
 	/** Product Pricing				*/
-	private IProductPricing	m_productPricing = null;
+	protected IProductPricing	m_productPricing = null;
 	/** Parent						*/
-	private MInvoice	m_parent = null;
+	protected MInvoice	m_parent = null;
 
 	/**
 	 * 	Set Defaults from Order.
@@ -1187,7 +1187,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	/**
 	 * 	Allocate Landed Cost - Enforce Rounding
 	 */
-	private void allocateLandedCostRounding()
+	protected void allocateLandedCostRounding()
 	{
 		MLandedCostAllocation[] allocations = MLandedCostAllocation.getOfInvoiceLine(
 			getCtx(), getC_InvoiceLine_ID(), get_TrxName());
diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java
index 36d16eeedd..05e8ece324 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournal.java
@@ -53,7 +53,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -364132249042527640L;
+	private static final long serialVersionUID = 6116307358915557651L;
 
 	/**
 	 * 	Standard Constructor
@@ -372,7 +372,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	 * 	Update Batch total
 	 *	@return true if ok
 	 */
-	private boolean updateBatch()
+	protected boolean updateBatch()
 	{
 		if (getGL_JournalBatch_ID()!=0) {	// idempiere 344 - nmicoud
 			StringBuilder sql = new StringBuilder("UPDATE GL_JournalBatch jb")
@@ -401,9 +401,9 @@ public class MJournal extends X_GL_Journal implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -628,7 +628,7 @@ public class MJournal extends X_GL_Journal implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			if (this.getProcessedOn().signum() == 0) {
diff --git a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
index 493a4167c9..a3b6ffe9b4 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
@@ -52,7 +52,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2494833602067696046L;
+	private static final long serialVersionUID = 3424249393848608297L;
 
 	/**
 	 * 	Create new Journal Batch by copying
@@ -275,9 +275,9 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	}	//	process
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -507,7 +507,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setDateDoc(TimeUtil.getDay(0));
diff --git a/org.adempiere.base/src/org/compiere/model/MJournalLine.java b/org.adempiere.base/src/org/compiere/model/MJournalLine.java
index d295c018f8..8778b1e2a3 100644
--- a/org.adempiere.base/src/org/compiere/model/MJournalLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MJournalLine.java
@@ -39,7 +39,7 @@ public class MJournalLine extends X_GL_JournalLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 7584093911055786835L;
+	private static final long serialVersionUID = 253571209449736797L;
 
 	/**
 	 * 	Standard Constructor
@@ -95,7 +95,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	MJournalLine
 
 	/** Parent					*/
-	private MJournal	m_parent = null;
+	protected MJournal	m_parent = null;
 	
 	/**
 	 * 	Get Parent
@@ -110,11 +110,11 @@ public class MJournalLine extends X_GL_JournalLine
 	
 
 	/**	Currency Precision		*/
-	private int					m_precision = 2;
+	protected int					m_precision = 2;
 	/**	Account Combination		*/
-	private MAccount		 	m_account = null;
+	protected MAccount		 	m_account = null;
 	/** Account Element			*/
-	private MElementValue		m_accountElement = null;
+	protected MElementValue		m_accountElement = null;
 	
 	/**
 	 * 	Set Currency Info
@@ -354,7 +354,7 @@ public class MJournalLine extends X_GL_JournalLine
 	 * 	Update Journal and Batch Total
 	 *	@return true if success
 	 */
-	private boolean updateJournalTotal()
+	protected boolean updateJournalTotal()
 	{
 		//	Update Journal Total
 		StringBuilder sql = new StringBuilder("UPDATE GL_Journal j")
@@ -382,7 +382,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	updateJournalTotal
 
 	/** Update combination and optionally **/
-	private boolean getOrCreateCombination()
+	protected boolean getOrCreateCombination()
 	{
 		if (getC_ValidCombination_ID() == 0
 				|| (!is_new() && (is_ValueChanged("Account_ID")
@@ -458,7 +458,7 @@ public class MJournalLine extends X_GL_JournalLine
 	}	//	getOrCreateCombination
 
 	/** Fill Accounting Dimensions from line combination **/
-	private void fillDimensionsFromCombination()
+	protected void fillDimensionsFromCombination()
 	{
 		if (getC_ValidCombination_ID() > 0)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MLocator.java b/org.adempiere.base/src/org/compiere/model/MLocator.java
index c7b0cbb97e..1fd76d5dc6 100644
--- a/org.adempiere.base/src/org/compiere/model/MLocator.java
+++ b/org.adempiere.base/src/org/compiere/model/MLocator.java
@@ -39,7 +39,7 @@ public class MLocator extends X_M_Locator
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3649134803161895263L;
+	private static final long serialVersionUID = -4502919527066173270L;
 
 	/**
 	 * 	Get oldest Default Locator of warehouse with locator
@@ -191,7 +191,7 @@ public class MLocator extends X_M_Locator
 	} //	get
 
 	/**	Cache						*/
-	private volatile static CCache<Integer,MLocator> s_cache; 
+	protected volatile static CCache<Integer,MLocator> s_cache; 
 	 
 	/**	Logger						*/
 	private static CLogger		s_log = CLogger.getCLogger (MLocator.class);
diff --git a/org.adempiere.base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java
index 3cb26cc98b..7739de2c7b 100644
--- a/org.adempiere.base/src/org/compiere/model/MMailText.java
+++ b/org.adempiere.base/src/org/compiere/model/MMailText.java
@@ -40,7 +40,7 @@ public class MMailText extends X_R_MailText
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5088779317275846829L;
+	private static final long serialVersionUID = -6458808409321394821L;
 
 	/**
 	 * 	Standard Constructor
@@ -65,22 +65,22 @@ public class MMailText extends X_R_MailText
 	}	//	MMailText
 
 	/**	Parse User			*/
-	private MUser		m_user = null;
+	protected MUser		m_user = null;
 	/** Parse BPartner		*/
-	private MBPartner	m_bpartner = null;
+	protected MBPartner	m_bpartner = null;
 	/** Parse PO			*/
-	private PO			m_po = null;
+	protected PO			m_po = null;
 	/** Translated Header	*/
-	private String		m_MailHeader = null;
+	protected String		m_MailHeader = null;
 	/** Translated Text		*/
-	private String		m_MailText = null;
+	protected String		m_MailText = null;
 	/** Translated Text 2	*/
-	private String		m_MailText2 = null;
+	protected String		m_MailText2 = null;
 	/** Translated Text 3	*/
-	private String		m_MailText3 = null;
+	protected String		m_MailText3 = null;
 	/** Translation Cache	*/
-	private static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
-	private String m_language = null;
+	protected static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
+	protected String m_language = null;
 	
 	/**
 	 * 	Get parsed/translated Mail Text
@@ -155,7 +155,7 @@ public class MMailText extends X_R_MailText
 	 *	@param text text
 	 *	@return parsed text
 	 */
-	private String parse (String text)
+	protected String parse (String text)
 	{
 		if (Util.isEmpty(text) || text.indexOf('@') == -1)
 			return text;
@@ -175,7 +175,7 @@ public class MMailText extends X_R_MailText
 	 *	@param po object
 	 *	@return parsed text
 	 */
-	private String parse (String text, PO po)
+	protected String parse (String text, PO po)
 	{
 		if (po == null || Util.isEmpty(text) || text.indexOf('@') == -1)
 			return text;
@@ -214,7 +214,7 @@ public class MMailText extends X_R_MailText
 	 *	@param po po
 	 *	@return translated variable or if not found the original tag
 	 */
-	private String parseVariable (String variable, PO po)
+	protected String parseVariable (String variable, PO po)
 	{
 		if (variable.contains("<") && variable.contains(">")) { // IDEMPIERE-3096
 			return Env.parseVariable("@"+variable+"@", po, get_TrxName(), true);
@@ -327,7 +327,7 @@ public class MMailText extends X_R_MailText
 	/**
 	 * 	Translate to BPartner Language
 	 */
-	private void translate()
+	protected void translate()
 	{
 		//	Default if no Translation
 		m_MailHeader = super.getMailHeader();
@@ -360,7 +360,7 @@ public class MMailText extends X_R_MailText
 	 *	@param AD_Language language
 	 *	@return trl
 	 */
-	private MMailTextTrl getTranslation (String AD_Language)
+	protected MMailTextTrl getTranslation (String AD_Language)
 	{
 		MMailTextTrl trl = null;
 		PreparedStatement pstmt = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MMatchInv.java b/org.adempiere.base/src/org/compiere/model/MMatchInv.java
index 12c272e775..9bfb064ae4 100644
--- a/org.adempiere.base/src/org/compiere/model/MMatchInv.java
+++ b/org.adempiere.base/src/org/compiere/model/MMatchInv.java
@@ -48,7 +48,7 @@ public class MMatchInv extends X_M_MatchInv
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3668871839074170205L;
+	private static final long serialVersionUID = -6673764788466220541L;
 
 
 	/**
@@ -310,7 +310,7 @@ public class MMatchInv extends X_M_MatchInv
 	
 	//
 	//AZ Goodwill
-	private String deleteMatchInvCostDetail()
+	protected String deleteMatchInvCostDetail()
 	{
 		// Get Account Schemas to delete MCostDetail
 		MAcctSchema[] acctschemas = MAcctSchema.getClientAcctSchema(getCtx(), getAD_Client_ID());
diff --git a/org.adempiere.base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java
index 44308e982d..81ca8b82b1 100644
--- a/org.adempiere.base/src/org/compiere/model/MMatchPO.java
+++ b/org.adempiere.base/src/org/compiere/model/MMatchPO.java
@@ -59,7 +59,7 @@ public class MMatchPO extends X_M_MatchPO
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3669451656879485463L;
+	private static final long serialVersionUID = 487498668807522050L;
 
 	/**
 	 * 	Get PO Match with order/invoice
@@ -341,7 +341,7 @@ public class MMatchPO extends X_M_MatchPO
 		}
 	}
 	
-	private static MMatchPO create(Properties ctx, MInvoiceLine iLine,
+	protected static MMatchPO create(Properties ctx, MInvoiceLine iLine,
 			MInOutLine sLine, int C_OrderLine_ID, Timestamp dateTrx,
 			BigDecimal qty, String trxName) {
 		MMatchPO retValue = null;
@@ -631,13 +631,13 @@ public class MMatchPO extends X_M_MatchPO
 	}	//	create
 	
 
-	private MMatchInv m_matchInv;
+	protected MMatchInv m_matchInv;
 
 	/**
 	 * Register the match inv created for immediate accounting purposes
 	 * @param matchInv
 	 */
-	private void setMatchInvCreated(MMatchInv matchInv) {
+	protected void setMatchInvCreated(MMatchInv matchInv) {
 		m_matchInv = matchInv;
 	}
 
@@ -732,13 +732,13 @@ public class MMatchPO extends X_M_MatchPO
 	}	//	MMatchPO
 	
 	/** Invoice Changed			*/
-	private boolean m_isInvoiceLineChange = false;
+	protected boolean m_isInvoiceLineChange = false;
 	/** InOut Changed			*/
-	private boolean m_isInOutLineChange = false;
+	protected boolean m_isInOutLineChange = false;
 	/** Order Line				*/
-	private MOrderLine		m_oLine = null;
+	protected MOrderLine		m_oLine = null;
 	/** Invoice Line			*/
-	private MInvoiceLine	m_iLine = null;
+	protected MInvoiceLine	m_iLine = null;
 	
 	
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java
index 297c9ec714..1a9d7fe67a 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovement.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovement.java
@@ -54,7 +54,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1628932946440487727L;
+	private static final long serialVersionUID = 3201199540429467933L;
 
 	/**
 	 * 	Standard Constructor
@@ -90,9 +90,9 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	MMovement
 
 	/**	Lines						*/
-	private MMovementLine[]		m_lines = null;
+	protected MMovementLine[]		m_lines = null;
 	/** Confirmations				*/
-	private MMovementConfirm[]	m_confirms = null;
+	protected MMovementConfirm[]	m_confirms = null;
 	/** Reversal Indicator			*/
 	public static String	REVERSE_INDICATOR = "^";
 	
@@ -242,9 +242,9 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -346,7 +346,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 	Create Movement Confirmation
 	 */
-	private void createConfirmation()
+	protected void createConfirmation()
 	{
 		MMovementConfirm[] confirmations = getConfirmations(false);
 		if (confirmations.length > 0)
@@ -629,7 +629,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		if (dt.isOverwriteDateOnComplete()) {
 			setMovementDate(TimeUtil.getDay(0));
@@ -646,7 +646,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	 * 	Check Material Policy
 	 * 	Sets line ASI
 	 */
-	private void checkMaterialPolicy(MMovementLine line,BigDecimal qtyToDeliver)
+	protected void checkMaterialPolicy(MMovementLine line,BigDecimal qtyToDeliver)
 	{
 		
 		int no = MMovementLineMA.deleteMovementLineMA(line.getM_MovementLine_ID(), get_TrxName());
@@ -825,7 +825,7 @@ public class MMovement extends X_M_Movement implements DocAction
 		return true;
 	}	//	reverseCorrectionIt
 	
-	private MMovement reverse(boolean accrual)
+	protected MMovement reverse(boolean accrual)
 	{
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
@@ -1014,13 +1014,13 @@ public class MMovement extends X_M_Movement implements DocAction
 	}	//	getC_Currency_ID
 	
 	/** Reversal Flag		*/
-	private boolean m_reversal = false;
+	protected boolean m_reversal = false;
 	
 	/**
 	 * 	Set Reversal
 	 *	@param reversal reversal
 	 */
-	private void setReversal(boolean reversal)
+	protected void setReversal(boolean reversal)
 	{
 		m_reversal = reversal;
 	}	//	setReversal
@@ -1028,7 +1028,7 @@ public class MMovement extends X_M_Movement implements DocAction
 	 * 	Is Reversal
 	 *	@return reversal
 	 */
-	private boolean isReversal()
+	protected boolean isReversal()
 	{
 		return m_reversal;
 	}	//	isReversal
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
index 05c415716e..76ff932c8f 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
@@ -51,7 +51,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5210710606049843678L;
+	private static final long serialVersionUID = -399427235334348654L;
 
 	/**
 	 * 	Create Confirmation or return existing one
@@ -127,15 +127,15 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	}	//	MInOutConfirm
 	
 	/**	Confirm Lines					*/
-	private MMovementLineConfirm[]	m_lines = null;
+	protected MMovementLineConfirm[]	m_lines = null;
 	
 	/**	Physical Inventory From	*/
-	private MInventory				m_inventoryFrom = null;
+	protected MInventory				m_inventoryFrom = null;
 	/**	Physical Inventory To	*/
-	private MInventory				m_inventoryTo = null;
+	protected MInventory				m_inventoryTo = null;
 	/**	Physical Inventory Info	*/
-	private String					m_inventoryInfo = null;
-	private List<MInventory>		m_inventoryDoc = null;			
+	protected String					m_inventoryInfo = null;
+	protected List<MInventory>		m_inventoryDoc = null;		
 
 	/**
 	 * 	Get Lines
@@ -264,9 +264,9 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	}	//	processIt
 	
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -468,7 +468,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	 *	@param confirm confirm line
 	 *	@return true if created
 	 */
-	private boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm)
+	protected boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm)
 	{
 		MMovementLine mLine = confirm.getLine();
 		
@@ -567,7 +567,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * 
 	 */
-	private void updateProcessMsg(String msg) {
+	protected void updateProcessMsg(String msg) {
 		if (m_processMsg != null)
 			m_processMsg = m_processMsg + " " + msg;
 		else
@@ -581,7 +581,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 	/**
 	 * @param inventory 
 	 */
-	private void setInventoryDocType(MInventory inventory) {
+	protected void setInventoryDocType(MInventory inventory) {
 		MDocType[] doctypes = MDocType.getOfDocBaseType(Env.getCtx(), X_C_DocType.DOCBASETYPE_MaterialPhysicalInventory);
 		for(MDocType doctype : doctypes)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
index ac2c73e162..b2eaad6e88 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
@@ -38,7 +38,7 @@ public class MMovementLine extends X_M_MovementLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4078367839033015886L;
+	private static final long serialVersionUID = -5753062311388766921L;
 
 	/**
 	 * 	Standard Cosntructor
@@ -144,7 +144,7 @@ public class MMovementLine extends X_M_MovementLine
 	}	//	setMovementQty
 	
 	/** Parent							*/
-	private MMovement m_parent = null;
+	protected MMovement m_parent = null;
 	
 	/**
 	 * get Parent
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
index be531e96d5..11068ec814 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
@@ -34,7 +34,7 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2406580342096137696L;
+	private static final long serialVersionUID = -5447921784818655144L;
 
 	/**
 	 * 	Standard Constructor
@@ -79,7 +79,7 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm
 	}	//	MMovementLineConfirm
 
 	/**	Movement Line			*/
-	private MMovementLine 	m_line = null;
+	protected MMovementLine 	m_line = null;
 	
 	/**
 	 * 	Set Movement Line
diff --git a/org.adempiere.base/src/org/compiere/model/MProduction.java b/org.adempiere.base/src/org/compiere/model/MProduction.java
index 9b82889191..f3b6898ad0 100644
--- a/org.adempiere.base/src/org/compiere/model/MProduction.java
+++ b/org.adempiere.base/src/org/compiere/model/MProduction.java
@@ -26,16 +26,16 @@ public class MProduction extends X_M_Production implements DocAction {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 8047044372956625013L;
+	private static final long serialVersionUID = -4650232602150964606L;
 
 	/**
 	 * 
 	 */
 	/** Log								*/
 	@SuppressWarnings("unused")
-	private static CLogger		m_log = CLogger.getCLogger (MProduction.class);
-	private int lineno;
-	private int count;
+	protected static CLogger		m_log = CLogger.getCLogger (MProduction.class);
+	protected int lineno;
+	protected int count;
 
 	public MProduction(Properties ctx, int M_Production_ID, String trxName) {
 		super(ctx, M_Production_ID, trxName);
@@ -164,7 +164,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return false;
 	}
 
-	private Object processLines(MProductionLine[] lines) {
+	protected Object processLines(MProductionLine[] lines) {
 		StringBuilder errors = new StringBuilder();
 		for ( int i = 0; i<lines.length; i++) {
 			String error = lines[i].createTransactions(getMovementDate(), false);
@@ -247,7 +247,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return count;
 	}
 
-	private int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) {
+	protected int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) {
 		
 		int defaultLocator = 0;
 		
@@ -453,9 +453,9 @@ public class MProduction extends X_M_Production implements DocAction {
 	}
 
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	@Override
 	public boolean unlockIt() {
@@ -703,7 +703,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return true;
 	}
 
-	private MProduction reverse(boolean accrual) {
+	protected MProduction reverse(boolean accrual) {
 		Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
 		if (reversalDate == null) {
 			reversalDate = new Timestamp(System.currentTimeMillis());
@@ -760,7 +760,7 @@ public class MProduction extends X_M_Production implements DocAction {
 		return reversal;
 	}
 
-	private MProduction copyFrom(Timestamp reversalDate) {
+	protected MProduction copyFrom(Timestamp reversalDate) {
 		MProduction to = new MProduction(getCtx(), 0, get_TrxName());
 		PO.copyValues (this, to, getAD_Client_ID(), getAD_Org_ID());
 
diff --git a/org.adempiere.base/src/org/compiere/model/MProductionLine.java b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
index 3cd26ae903..3cf60305af 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
@@ -20,9 +20,9 @@ public class MProductionLine extends X_M_ProductionLine {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 5939914729719167512L;
+	private static final long serialVersionUID = 3720901152312853611L;
 
-	private MProduction productionParent;
+	protected MProduction productionParent;
 
 
 	/**
@@ -323,7 +323,7 @@ public class MProductionLine extends X_M_ProductionLine {
 		
 	}
 
-	private int getEndProduct_ID() {
+	protected int getEndProduct_ID() {
 		if (productionParent != null) {
 			return productionParent.getM_Product_ID();
 		} else if (getM_Production_ID() > 0) {
@@ -333,7 +333,7 @@ public class MProductionLine extends X_M_ProductionLine {
 		}
 	}
 
-	private int deleteMA() {
+	protected int deleteMA() {
 		String sql = "DELETE FROM M_ProductionLineMA WHERE M_ProductionLine_ID = " + get_ID();
 		int count = DB.executeUpdateEx( sql, get_TrxName() );
 		return count;
diff --git a/org.adempiere.base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java
index c15742b3f1..157e697a7e 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMA.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMA.java
@@ -47,7 +47,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -6449007672684459651L;
+	private static final long serialVersionUID = 6196067840638153414L;
 
 	/**
 	 * 	Standard Constructor
@@ -83,11 +83,11 @@ public class MRMA extends X_M_RMA implements DocAction
 	}	//	MRMA
 
 	/** Lines					*/
-	private MRMALine[]		m_lines = null;
+	protected MRMALine[]		m_lines = null;
 	/**	Tax Lines					*/
-	private MRMATax[] 		m_taxes = null;
+	protected MRMATax[] 		m_taxes = null;
 	/** The Shipment			*/
-	private MInOut			m_inout = null;
+	protected MInOut			m_inout = null;
 
 	/**
 	 * 	Get Lines
@@ -300,9 +300,9 @@ public class MRMA extends X_M_RMA implements DocAction
 	}	//	process
 
 	/**	Process Message 			*/
-	private String		m_processMsg = null;
+	protected String		m_processMsg = null;
 	/**	Just Prepared Flag			*/
-	private boolean		m_justPrepared = false;
+	protected boolean		m_justPrepared = false;
 
 	/**
 	 * 	Unlock Document.
@@ -474,7 +474,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	/**
 	 * 	Set the definite document number after completed
 	 */
-	private void setDefiniteDocumentNo() {
+	protected void setDefiniteDocumentNo() {
 		MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
 		/* No Document Date on RMA
 		if (dt.isOverwriteDateOnComplete()) {
@@ -492,7 +492,7 @@ public class MRMA extends X_M_RMA implements DocAction
 	 * 	Create Counter Document
 	 * 	@return InOut
 	 */
-	private MRMA createCounterDoc()
+	protected MRMA createCounterDoc()
 	{
 		//	Is this a counter doc ?
 		if (getRef_RMA_ID() > 0)
diff --git a/org.adempiere.base/src/org/compiere/model/MRMALine.java b/org.adempiere.base/src/org/compiere/model/MRMALine.java
index f37d2a8871..58c5ebf791 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMALine.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMALine.java
@@ -40,7 +40,7 @@ public class MRMALine extends X_M_RMALine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3459158383642518763L;
+	private static final long serialVersionUID = 3088864372141663734L;
 
 	/**
 	 * 	Standard Constructor
@@ -73,25 +73,25 @@ public class MRMALine extends X_M_RMALine
 	}	//	MRMALine
 	
 	/**	Shipment Line			*/
-	private MInOutLine	m_ioLine = null;
+	protected MInOutLine	m_ioLine = null;
 	/**	Product					*/
-	private MProduct	m_product = null;
+	protected MProduct	m_product = null;
 	/**	Charge					*/
-	private MCharge		m_charge = null;
+	protected MCharge		m_charge = null;
 	/** Tax							*/
-	private MTax 		m_tax = null;
+	protected MTax 		m_tax = null;
 	/** Parent                  */
-	private MRMA		m_parent = null;
+	protected MRMA		m_parent = null;
     
-    private int precision = 0;
-    private BigDecimal unitAmount = Env.ZERO;
-    private BigDecimal originalQty = Env.ZERO;
-    private int taxId = 0;
+    protected int precision = 0;
+    protected BigDecimal unitAmount = Env.ZERO;
+    protected BigDecimal originalQty = Env.ZERO;
+    protected int taxId = 0;
     
     /**
      * Initialise parameters that are required
      */
-    private void init()
+    protected void init()
     {
         getShipLine();
         
@@ -223,7 +223,7 @@ public class MRMALine extends X_M_RMALine
      * Retrieves the invoiceLine Id associated with the Shipment/Receipt Line
      * @return Invoice Line ID
      */
-    private int getInvoiceLineId()
+    protected int getInvoiceLineId()
     {
     	int invoiceLine_ID = new Query(getCtx(), I_C_InvoiceLine.Table_Name, "M_InOutLine_ID=?", get_TrxName())
     	.setParameters(getM_InOutLine_ID())
diff --git a/org.adempiere.base/src/org/compiere/model/MUOM.java b/org.adempiere.base/src/org/compiere/model/MUOM.java
index 83bb1d2c0d..7b321ec903 100644
--- a/org.adempiere.base/src/org/compiere/model/MUOM.java
+++ b/org.adempiere.base/src/org/compiere/model/MUOM.java
@@ -38,7 +38,7 @@ public class MUOM extends X_C_UOM
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -7248044516358949324L;
+	private static final long serialVersionUID = 3119054530389871561L;
 	/** X12 Element 355 Code	Second	*/
 	public static final String		X12_SECOND = "03";
 	/** X12 Element 355 Code	Minute	*/
@@ -97,7 +97,7 @@ public class MUOM extends X_C_UOM
 	/*************************************************************************/
 
 	/**	UOM Cache				*/
-	private static CCache<Integer,MUOM>	s_cache = new CCache<Integer,MUOM>(Table_Name, 30);
+	protected static CCache<Integer,MUOM>	s_cache = new CCache<Integer,MUOM>(Table_Name, 30);
 
 	/**
 	 * 	Get UOM from Cache
@@ -150,7 +150,7 @@ public class MUOM extends X_C_UOM
 	 * 	Load All UOMs
 	 * 	@param ctx context
 	 */
-	private static void loadUOMs (Properties ctx)
+	protected static void loadUOMs (Properties ctx)
 	{
 		List<MUOM> list = new Query(ctx, Table_Name, "IsActive='Y'", null)
 								.setApplyAccessFilter(MRole.SQL_NOTQUALIFIED, MRole.SQL_RO)
diff --git a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
index cc239dd91a..d31902694a 100644
--- a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
+++ b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
@@ -48,7 +48,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -8449239579085422641L;
+	private static final long serialVersionUID = 3555218774291122619L;
 
 
 	/**
@@ -146,7 +146,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	 * 	@param p Point with from(x) - to(y) C_UOM_ID
 	 * 	@return conversion multiplier or null
 	 */
-	static private BigDecimal getRate (Properties ctx, Point p)
+	static protected BigDecimal getRate (Properties ctx, Point p)
 	{
 		BigDecimal retValue = null;
 		if (Ini.isClient())
@@ -167,7 +167,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	 * 	Create Conversion Matrix (Client)
 	 * 	@param ctx context
 	 */
-	private static void createRates (Properties ctx)
+	protected static void createRates (Properties ctx)
 	{
 		s_conversions = new CCache<Point,BigDecimal>(Table_Name, 20);
 		//
@@ -631,11 +631,11 @@ public class MUOMConversion extends X_C_UOM_Conversion
 	/** Static Logger					*/
 	private static final CLogger s_log = CLogger.getCLogger(MUOMConversion.class);
 	/**	Indicator for Rate					*/
-	private static final BigDecimal GETRATE = BigDecimal.valueOf(123.456);
+	protected static final BigDecimal GETRATE = BigDecimal.valueOf(123.456);
 	/**	Conversion Map: Key=Point(from,to) Value=BigDecimal	*/
-	private static CCache<Point,BigDecimal>	s_conversions = null;
+	protected static CCache<Point,BigDecimal>	s_conversions = null;
 	/** Product Conversion Map					*/
-	private static final CCache<Integer,MUOMConversion[]>	s_conversionProduct 
+	protected static final CCache<Integer,MUOMConversion[]>	s_conversionProduct 
 		= new CCache<Integer,MUOMConversion[]>(Table_Name, Table_Name+"_Of_Product", 20); 
 	
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MWarehouse.java b/org.adempiere.base/src/org/compiere/model/MWarehouse.java
index 2f6d223310..7943bc89e7 100644
--- a/org.adempiere.base/src/org/compiere/model/MWarehouse.java
+++ b/org.adempiere.base/src/org/compiere/model/MWarehouse.java
@@ -41,7 +41,7 @@ public class MWarehouse extends X_M_Warehouse
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2696705459515717619L;
+	private static final long serialVersionUID = -3065089372599460372L;
 
 	/**
 	 * 	Get from Cache
@@ -109,7 +109,7 @@ public class MWarehouse extends X_M_Warehouse
 	}	//	get
 	
 	/**	Cache					*/
-	private static CCache<Integer,MWarehouse> s_cache = new CCache<Integer,MWarehouse>(Table_Name, 50 );	
+	protected static CCache<Integer,MWarehouse> s_cache = new CCache<Integer,MWarehouse>(Table_Name, 50 );	
 	/**
 	 * 	Standard Constructor
 	 *	@param ctx context
@@ -154,7 +154,7 @@ public class MWarehouse extends X_M_Warehouse
 	}	//	MWarehouse
 
 	/**	Warehouse Locators				*/
-	private MLocator[]	m_locators = null;
+	protected MLocator[]	m_locators = null;
 	
 	/**
 	 * 	Get Locators