midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2793 Extendability improvements / integrate patch from logilite (Deepak) - Changed private access modifier of members to 'Protected'

This commit is contained in:
Carlos Ruiz 2018-10-12 12:30:48 +02:00
parent e72c735f52
commit 2a60d4b405
30 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base/src/org/compiere/model/MBPartner.java
View File

@ -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 * Get Empty Template Business Partner
@ -308,24 +308,24 @@ public class MBPartner extends X_C_BPartner
/** Users */ /** Users */
private MUser[] m_contacts = null; protected MUser[] m_contacts = null;
/** Addressed */ /** Addressed */
private MBPartnerLocation[] m_locations = null; protected MBPartnerLocation[] m_locations = null;
/** BP Bank Accounts */ /** BP Bank Accounts */
private MBPBankAccount[] m_accounts = null; protected MBPBankAccount[] m_accounts = null;
/** Prim Address */ /** Prim Address */
private Integer m_primaryC_BPartner_Location_ID = null; protected Integer m_primaryC_BPartner_Location_ID = null;
/** Prim User */ /** Prim User */
private Integer m_primaryAD_User_ID = null; protected Integer m_primaryAD_User_ID = null;
/** BP Group */ /** BP Group */
private MBPGroup m_group = null; protected MBPGroup m_group = null;
/** /**
* Load Default BPartner * Load Default BPartner
* @param AD_Client_ID client * @param AD_Client_ID client
* @return true if loaded * @return true if loaded
*/ */
private boolean initTemplate (int AD_Client_ID) protected boolean initTemplate (int AD_Client_ID)
{ {
if (AD_Client_ID == 0) if (AD_Client_ID == 0)
throw new IllegalArgumentException ("Client_ID=0"); throw new IllegalArgumentException ("Client_ID=0");

8
org.adempiere.base/src/org/compiere/model/MBankStatement.java
View File

@ -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 * Standard Constructor
@ -117,7 +117,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
} // MBankStatement } // MBankStatement
/** Lines */ /** Lines */
private MBankStatementLine[] m_lines = null; protected MBankStatementLine[] m_lines = null;
/** /**
* Get Bank Statement Lines * Get Bank Statement Lines
@ -265,9 +265,9 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
} // processIt } // processIt
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.

6
org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
View File

@ -44,7 +44,7 @@ import org.compiere.util.Msg;
/** /**
* *
*/ */
private static final long serialVersionUID = 1914411222159254809L; private static final long serialVersionUID = 3809130336412385420L;
/** /**
* Standard Constructor * Standard Constructor
@ -210,7 +210,7 @@ import org.compiere.util.Msg;
} // beforeSave } // beforeSave
/** Parent */ /** Parent */
private MBankStatement m_parent = null; protected MBankStatement m_parent = null;
/** /**
* Get Parent * Get Parent
@ -251,7 +251,7 @@ import org.compiere.util.Msg;
/** /**
* Update Header * Update Header
*/ */
private boolean updateHeader() protected boolean updateHeader()
{ {
StringBuilder sql = new StringBuilder("UPDATE C_BankStatement bs") StringBuilder sql = new StringBuilder("UPDATE C_BankStatement bs")
.append(" SET StatementDifference=(SELECT COALESCE(SUM(StmtAmt),0) FROM C_BankStatementLine bsl ") .append(" SET StatementDifference=(SELECT COALESCE(SUM(StmtAmt),0) FROM C_BankStatementLine bsl ")

12
org.adempiere.base/src/org/compiere/model/MCash.java
View File

@ -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 } // MCash
/** Lines */ /** Lines */
private MCashLine[] m_lines = null; protected MCashLine[] m_lines = null;
/** CashBook */ /** CashBook */
private MCashBook m_book = null; protected MCashBook m_book = null;
/** /**
* Get Lines * Get Lines
@ -324,9 +324,9 @@ public class MCash extends X_C_Cash implements DocAction
} // process } // process
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -593,7 +593,7 @@ public class MCash extends X_C_Cash implements DocAction
* Period needs to be open * Period needs to be open
* @return true if reversed * @return true if reversed
*/ */
private boolean reverseIt() protected boolean reverseIt()
{ {
if (DOCSTATUS_Closed.equals(getDocStatus()) if (DOCSTATUS_Closed.equals(getDocStatus())
|| DOCSTATUS_Reversed.equals(getDocStatus()) || DOCSTATUS_Reversed.equals(getDocStatus())

12
org.adempiere.base/src/org/compiere/model/MCashLine.java
View File

@ -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 } // MCashLine
/** Parent */ /** Parent */
private MCash m_parent = null; protected MCash m_parent = null;
/** Cash Book */ /** Cash Book */
private MCashBook m_cashBook = null; protected MCashBook m_cashBook = null;
/** Bank Account */ /** Bank Account */
private MBankAccount m_bankAccount = null; protected MBankAccount m_bankAccount = null;
/** Invoice */ /** 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 * Statement Difference, Ending Balance
* @return true if success * @return true if success
*/ */
private boolean updateHeader() protected boolean updateHeader()
{ {
String sql = "UPDATE C_Cash c" String sql = "UPDATE C_Cash c"
+ " SET StatementDifference=" + " SET StatementDifference="

4
org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
View File

@ -32,7 +32,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
/** /**
* *
*/ */
private static final long serialVersionUID = 3897658515979106674L; private static final long serialVersionUID = -5535407146793681944L;
/** Logger */ /** Logger */
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -110,7 +110,7 @@ public class MCashPlanLine extends X_C_CashPlanLine
* Update Header * Update Header
* @return true if header updated * @return true if header updated
*/ */
private boolean updateHeader() protected boolean updateHeader()
{ {
// Update Cash Plan Header // Update Cash Plan Header
StringBuilder sql = new StringBuilder("UPDATE C_CashPlan ") StringBuilder sql = new StringBuilder("UPDATE C_CashPlan ")

10
org.adempiere.base/src/org/compiere/model/MCost.java
View File

@ -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 * Retrieve/Calculate Current Cost Price
@ -123,7 +123,7 @@ public class MCost extends X_M_Cost
* @param trxName trx * @param trxName trx
* @return cost price or null * @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, MAcctSchema as, int Org_ID, int M_CostType_ID,
String costingMethod, BigDecimal qty, int C_OrderLine_ID, String costingMethod, BigDecimal qty, int C_OrderLine_ID,
boolean zeroCostsOK, String trxName) boolean zeroCostsOK, String trxName)
@ -420,7 +420,7 @@ public class MCost extends X_M_Cost
} // getSeedCosts } // getSeedCosts
private static BigDecimal getSeedCostFromPriceList(MProduct product, protected static BigDecimal getSeedCostFromPriceList(MProduct product,
MAcctSchema as, int orgID) { MAcctSchema as, int orgID) {
String sql = "SELECT pp.PriceList, pp.PriceStd FROM M_ProductPrice pp" + 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))" + " 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 } // MCost
/** Data is entered Manually */ /** Data is entered Manually */
private boolean m_manual = true; protected boolean m_manual = true;
/** /**
* Add Cumulative Amt/Qty and Current Qty * Add Cumulative Amt/Qty and Current Qty
@ -1571,7 +1571,7 @@ public class MCost extends X_M_Cost
* Get Costing Precision * Get Costing Precision
* @return precision (6) * @return precision (6)
*/ */
private int getPrecision() protected int getPrecision()
{ {
MAcctSchema as = MAcctSchema.get(getCtx(), getC_AcctSchema_ID()); MAcctSchema as = MAcctSchema.get(getCtx(), getC_AcctSchema_ID());
if (as != null) if (as != null)

6
org.adempiere.base/src/org/compiere/model/MCostDetail.java
View File

@ -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 " + "SELECT c.DocBaseType From M_InOut io " +
"INNER JOIN M_InOutLine iol ON io.M_InOut_ID=iol.M_InOut_ID " + "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 " + "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 * @param M_ASI_ID - asi corrected for costing level
* @return true if cost ok * @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) int Org_ID, int M_ASI_ID)
{ {
//handle compatibility issue between average invoice and average po //handle compatibility issue between average invoice and average po

4
org.adempiere.base/src/org/compiere/model/MCostElement.java
View File

@ -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 */ /** 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 */ /** Logger */
private static CLogger s_log = CLogger.getCLogger (MCostElement.class); private static CLogger s_log = CLogger.getCLogger (MCostElement.class);

22
org.adempiere.base/src/org/compiere/model/MInventory.java
View File

@ -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 */ /** Reversal Indicator */
public static String REVERSE_INDICATOR = "^"; public static String REVERSE_INDICATOR = "^";
@ -77,7 +77,7 @@ public class MInventory extends X_M_Inventory implements DocAction
} // get } // get
/** Cache */ /** 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 */ /** Lines */
private MInventoryLine[] m_lines = null; protected MInventoryLine[] m_lines = null;
/** /**
* Get Lines * Get Lines
@ -290,9 +290,9 @@ public class MInventory extends X_M_Inventory implements DocAction
} // processIt } // processIt
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -656,7 +656,7 @@ public class MInventory extends X_M_Inventory implements DocAction
/** /**
* Set the definite document number after completed * Set the definite document number after completed
*/ */
private void setDefiniteDocumentNo() { protected void setDefiniteDocumentNo() {
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
if (dt.isOverwriteDateOnComplete()) { if (dt.isOverwriteDateOnComplete()) {
setMovementDate(TimeUtil.getDay(0)); setMovementDate(TimeUtil.getDay(0));
@ -672,7 +672,7 @@ public class MInventory extends X_M_Inventory implements DocAction
/** /**
* Check Material Policy. * 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()); 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; return true;
} // reverseCorrectIt } // reverseCorrectIt
private MInventory reverse(boolean accrual) { protected MInventory reverse(boolean accrual) {
Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate(); Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
if (reversalDate == null) { if (reversalDate == null) {
reversalDate = new Timestamp(System.currentTimeMillis()); reversalDate = new Timestamp(System.currentTimeMillis());
@ -1113,13 +1113,13 @@ public class MInventory extends X_M_Inventory implements DocAction
/** Reversal Flag */ /** Reversal Flag */
private boolean m_reversal = false; protected boolean m_reversal = false;
/** /**
* Set Reversal * Set Reversal
* @param reversal reversal * @param reversal reversal
*/ */
private void setReversal(boolean reversal) protected void setReversal(boolean reversal)
{ {
m_reversal = reversal; m_reversal = reversal;
} // setReversal } // setReversal
@ -1127,7 +1127,7 @@ public class MInventory extends X_M_Inventory implements DocAction
* Is Reversal * Is Reversal
* @return reversal * @return reversal
*/ */
private boolean isReversal() protected boolean isReversal()
{ {
return m_reversal; return m_reversal;
} // isReversal } // isReversal

10
org.adempiere.base/src/org/compiere/model/MInventoryLine.java
View File

@ -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 * Get Inventory Line with parameters
@ -137,11 +137,11 @@ public class MInventoryLine extends X_M_InventoryLine
} }
/** Manually created */ /** Manually created */
// private boolean m_isManualEntry = true; //protected boolean m_isManualEntry = true;
/** Parent */ /** Parent */
private MInventory m_parent = null; protected MInventory m_parent = null;
/** Product */ /** Product */
private MProduct m_product = null; protected MProduct m_product = null;
/** /**
* Get Product * Get Product
@ -388,7 +388,7 @@ public class MInventoryLine extends X_M_InventoryLine
/** /**
* Create Material Allocations for new Instances * Create Material Allocations for new Instances
*/ */
/*private void createMA() /*protected void createMA()
{ {
MStorageOnHand[] storages = MStorageOnHand.getAll(getCtx(), getM_Product_ID(), MStorageOnHand[] storages = MStorageOnHand.getAll(getCtx(), getM_Product_ID(),
getM_Locator_ID(), get_TrxName()); getM_Locator_ID(), get_TrxName());

32
org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
View File

@ -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 * Get Invoice Line referencing InOut Line
@ -101,10 +101,10 @@ public class MInvoiceLine extends X_C_InvoiceLine
} }
/** Static Logger */ /** Static Logger */
private static CLogger s_log = CLogger.getCLogger (MInvoiceLine.class); protected static CLogger s_log = CLogger.getCLogger (MInvoiceLine.class);
/** Tax */ /** 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); super(ctx, rs, trxName);
} // MInvoiceLine } // MInvoiceLine
private int m_M_PriceList_ID = 0; protected int m_M_PriceList_ID = 0;
private Timestamp m_DateInvoiced = null; protected Timestamp m_DateInvoiced = null;
private int m_C_BPartner_ID = 0; protected int m_C_BPartner_ID = 0;
private int m_C_BPartner_Location_ID = 0; protected int m_C_BPartner_Location_ID = 0;
private boolean m_IsSOTrx = true; protected boolean m_IsSOTrx = true;
private boolean m_priceSet = false; protected boolean m_priceSet = false;
private MProduct m_product = null; protected MProduct m_product = null;
/** Charge */ /** Charge */
private MCharge m_charge = null; protected MCharge m_charge = null;
/** Cached Name of the line */ /** Cached Name of the line */
private String m_name = null; protected String m_name = null;
/** Cached Precision */ /** Cached Precision */
private Integer m_precision = null; protected Integer m_precision = null;
/** Product Pricing */ /** Product Pricing */
private IProductPricing m_productPricing = null; protected IProductPricing m_productPricing = null;
/** Parent */ /** Parent */
private MInvoice m_parent = null; protected MInvoice m_parent = null;
/** /**
* Set Defaults from Order. * Set Defaults from Order.
@ -1187,7 +1187,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
/** /**
* Allocate Landed Cost - Enforce Rounding * Allocate Landed Cost - Enforce Rounding
*/ */
private void allocateLandedCostRounding() protected void allocateLandedCostRounding()
{ {
MLandedCostAllocation[] allocations = MLandedCostAllocation.getOfInvoiceLine( MLandedCostAllocation[] allocations = MLandedCostAllocation.getOfInvoiceLine(
getCtx(), getC_InvoiceLine_ID(), get_TrxName()); getCtx(), getC_InvoiceLine_ID(), get_TrxName());

10
org.adempiere.base/src/org/compiere/model/MJournal.java
View File

@ -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 * Standard Constructor
@ -372,7 +372,7 @@ public class MJournal extends X_GL_Journal implements DocAction
* Update Batch total * Update Batch total
* @return true if ok * @return true if ok
*/ */
private boolean updateBatch() protected boolean updateBatch()
{ {
if (getGL_JournalBatch_ID()!=0) { // idempiere 344 - nmicoud if (getGL_JournalBatch_ID()!=0) { // idempiere 344 - nmicoud
StringBuilder sql = new StringBuilder("UPDATE GL_JournalBatch jb") StringBuilder sql = new StringBuilder("UPDATE GL_JournalBatch jb")
@ -401,9 +401,9 @@ public class MJournal extends X_GL_Journal implements DocAction
} // process } // process
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -628,7 +628,7 @@ public class MJournal extends X_GL_Journal implements DocAction
/** /**
* Set the definite document number after completed * Set the definite document number after completed
*/ */
private void setDefiniteDocumentNo() { protected void setDefiniteDocumentNo() {
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
if (dt.isOverwriteDateOnComplete()) { if (dt.isOverwriteDateOnComplete()) {
if (this.getProcessedOn().signum() == 0) { if (this.getProcessedOn().signum() == 0) {

8
org.adempiere.base/src/org/compiere/model/MJournalBatch.java
View File

@ -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 * Create new Journal Batch by copying
@ -275,9 +275,9 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
} // process } // process
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -507,7 +507,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
/** /**
* Set the definite document number after completed * Set the definite document number after completed
*/ */
private void setDefiniteDocumentNo() { protected void setDefiniteDocumentNo() {
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
if (dt.isOverwriteDateOnComplete()) { if (dt.isOverwriteDateOnComplete()) {
setDateDoc(TimeUtil.getDay(0)); setDateDoc(TimeUtil.getDay(0));

16
org.adempiere.base/src/org/compiere/model/MJournalLine.java
View File

@ -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 * Standard Constructor
@ -95,7 +95,7 @@ public class MJournalLine extends X_GL_JournalLine
} // MJournalLine } // MJournalLine
/** Parent */ /** Parent */
private MJournal m_parent = null; protected MJournal m_parent = null;
/** /**
* Get Parent * Get Parent
@ -110,11 +110,11 @@ public class MJournalLine extends X_GL_JournalLine
/** Currency Precision */ /** Currency Precision */
private int m_precision = 2; protected int m_precision = 2;
/** Account Combination */ /** Account Combination */
private MAccount m_account = null; protected MAccount m_account = null;
/** Account Element */ /** Account Element */
private MElementValue m_accountElement = null; protected MElementValue m_accountElement = null;
/** /**
* Set Currency Info * Set Currency Info
@ -354,7 +354,7 @@ public class MJournalLine extends X_GL_JournalLine
* Update Journal and Batch Total * Update Journal and Batch Total
* @return true if success * @return true if success
*/ */
private boolean updateJournalTotal() protected boolean updateJournalTotal()
{ {
// Update Journal Total // Update Journal Total
StringBuilder sql = new StringBuilder("UPDATE GL_Journal j") StringBuilder sql = new StringBuilder("UPDATE GL_Journal j")
@ -382,7 +382,7 @@ public class MJournalLine extends X_GL_JournalLine
} // updateJournalTotal } // updateJournalTotal
/** Update combination and optionally **/ /** Update combination and optionally **/
private boolean getOrCreateCombination() protected boolean getOrCreateCombination()
{ {
if (getC_ValidCombination_ID() == 0 if (getC_ValidCombination_ID() == 0
|| (!is_new() && (is_ValueChanged("Account_ID") || (!is_new() && (is_ValueChanged("Account_ID")
@ -458,7 +458,7 @@ public class MJournalLine extends X_GL_JournalLine
} // getOrCreateCombination } // getOrCreateCombination
/** Fill Accounting Dimensions from line combination **/ /** Fill Accounting Dimensions from line combination **/
private void fillDimensionsFromCombination() protected void fillDimensionsFromCombination()
{ {
if (getC_ValidCombination_ID() > 0) if (getC_ValidCombination_ID() > 0)
{ {

4
org.adempiere.base/src/org/compiere/model/MLocator.java
View File

@ -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 * Get oldest Default Locator of warehouse with locator
@ -191,7 +191,7 @@ public class MLocator extends X_M_Locator
} // get } // get
/** Cache */ /** Cache */
private volatile static CCache<Integer,MLocator> s_cache; protected volatile static CCache<Integer,MLocator> s_cache;
/** Logger */ /** Logger */
private static CLogger s_log = CLogger.getCLogger (MLocator.class); private static CLogger s_log = CLogger.getCLogger (MLocator.class);

30
org.adempiere.base/src/org/compiere/model/MMailText.java
View File

@ -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 * Standard Constructor
@ -65,22 +65,22 @@ public class MMailText extends X_R_MailText
} // MMailText } // MMailText
/** Parse User */ /** Parse User */
private MUser m_user = null; protected MUser m_user = null;
/** Parse BPartner */ /** Parse BPartner */
private MBPartner m_bpartner = null; protected MBPartner m_bpartner = null;
/** Parse PO */ /** Parse PO */
private PO m_po = null; protected PO m_po = null;
/** Translated Header */ /** Translated Header */
private String m_MailHeader = null; protected String m_MailHeader = null;
/** Translated Text */ /** Translated Text */
private String m_MailText = null; protected String m_MailText = null;
/** Translated Text 2 */ /** Translated Text 2 */
private String m_MailText2 = null; protected String m_MailText2 = null;
/** Translated Text 3 */ /** Translated Text 3 */
private String m_MailText3 = null; protected String m_MailText3 = null;
/** Translation Cache */ /** Translation Cache */
private static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20); protected static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
private String m_language = null; protected String m_language = null;
/** /**
* Get parsed/translated Mail Text * Get parsed/translated Mail Text
@ -155,7 +155,7 @@ public class MMailText extends X_R_MailText
* @param text text * @param text text
* @return parsed text * @return parsed text
*/ */
private String parse (String text) protected String parse (String text)
{ {
if (Util.isEmpty(text) || text.indexOf('@') == -1) if (Util.isEmpty(text) || text.indexOf('@') == -1)
return text; return text;
@ -175,7 +175,7 @@ public class MMailText extends X_R_MailText
* @param po object * @param po object
* @return parsed text * @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) if (po == null || Util.isEmpty(text) || text.indexOf('@') == -1)
return text; return text;
@ -214,7 +214,7 @@ public class MMailText extends X_R_MailText
* @param po po * @param po po
* @return translated variable or if not found the original tag * @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 if (variable.contains("<") && variable.contains(">")) { // IDEMPIERE-3096
return Env.parseVariable("@"+variable+"@", po, get_TrxName(), true); return Env.parseVariable("@"+variable+"@", po, get_TrxName(), true);
@ -327,7 +327,7 @@ public class MMailText extends X_R_MailText
/** /**
* Translate to BPartner Language * Translate to BPartner Language
*/ */
private void translate() protected void translate()
{ {
// Default if no Translation // Default if no Translation
m_MailHeader = super.getMailHeader(); m_MailHeader = super.getMailHeader();
@ -360,7 +360,7 @@ public class MMailText extends X_R_MailText
* @param AD_Language language * @param AD_Language language
* @return trl * @return trl
*/ */
private MMailTextTrl getTranslation (String AD_Language) protected MMailTextTrl getTranslation (String AD_Language)
{ {
MMailTextTrl trl = null; MMailTextTrl trl = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;

4
org.adempiere.base/src/org/compiere/model/MMatchInv.java
View File

@ -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 //AZ Goodwill
private String deleteMatchInvCostDetail() protected String deleteMatchInvCostDetail()
{ {
// Get Account Schemas to delete MCostDetail // Get Account Schemas to delete MCostDetail
MAcctSchema[] acctschemas = MAcctSchema.getClientAcctSchema(getCtx(), getAD_Client_ID()); MAcctSchema[] acctschemas = MAcctSchema.getClientAcctSchema(getCtx(), getAD_Client_ID());

16
org.adempiere.base/src/org/compiere/model/MMatchPO.java
View File

@ -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 * 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, MInOutLine sLine, int C_OrderLine_ID, Timestamp dateTrx,
BigDecimal qty, String trxName) { BigDecimal qty, String trxName) {
MMatchPO retValue = null; MMatchPO retValue = null;
@ -631,13 +631,13 @@ public class MMatchPO extends X_M_MatchPO
} // create } // create
private MMatchInv m_matchInv; protected MMatchInv m_matchInv;
/** /**
* Register the match inv created for immediate accounting purposes * Register the match inv created for immediate accounting purposes
* @param matchInv * @param matchInv
*/ */
private void setMatchInvCreated(MMatchInv matchInv) { protected void setMatchInvCreated(MMatchInv matchInv) {
m_matchInv = matchInv; m_matchInv = matchInv;
} }
@ -732,13 +732,13 @@ public class MMatchPO extends X_M_MatchPO
} // MMatchPO } // MMatchPO
/** Invoice Changed */ /** Invoice Changed */
private boolean m_isInvoiceLineChange = false; protected boolean m_isInvoiceLineChange = false;
/** InOut Changed */ /** InOut Changed */
private boolean m_isInOutLineChange = false; protected boolean m_isInOutLineChange = false;
/** Order Line */ /** Order Line */
private MOrderLine m_oLine = null; protected MOrderLine m_oLine = null;
/** Invoice Line */ /** Invoice Line */
private MInvoiceLine m_iLine = null; protected MInvoiceLine m_iLine = null;
/** /**

24
org.adempiere.base/src/org/compiere/model/MMovement.java
View File

@ -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 * Standard Constructor
@ -90,9 +90,9 @@ public class MMovement extends X_M_Movement implements DocAction
} // MMovement } // MMovement
/** Lines */ /** Lines */
private MMovementLine[] m_lines = null; protected MMovementLine[] m_lines = null;
/** Confirmations */ /** Confirmations */
private MMovementConfirm[] m_confirms = null; protected MMovementConfirm[] m_confirms = null;
/** Reversal Indicator */ /** Reversal Indicator */
public static String REVERSE_INDICATOR = "^"; public static String REVERSE_INDICATOR = "^";
@ -242,9 +242,9 @@ public class MMovement extends X_M_Movement implements DocAction
} // processIt } // processIt
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -346,7 +346,7 @@ public class MMovement extends X_M_Movement implements DocAction
/** /**
* Create Movement Confirmation * Create Movement Confirmation
*/ */
private void createConfirmation() protected void createConfirmation()
{ {
MMovementConfirm[] confirmations = getConfirmations(false); MMovementConfirm[] confirmations = getConfirmations(false);
if (confirmations.length > 0) if (confirmations.length > 0)
@ -629,7 +629,7 @@ public class MMovement extends X_M_Movement implements DocAction
/** /**
* Set the definite document number after completed * Set the definite document number after completed
*/ */
private void setDefiniteDocumentNo() { protected void setDefiniteDocumentNo() {
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
if (dt.isOverwriteDateOnComplete()) { if (dt.isOverwriteDateOnComplete()) {
setMovementDate(TimeUtil.getDay(0)); setMovementDate(TimeUtil.getDay(0));
@ -646,7 +646,7 @@ public class MMovement extends X_M_Movement implements DocAction
* Check Material Policy * Check Material Policy
* Sets line ASI * 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()); 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; return true;
} // reverseCorrectionIt } // reverseCorrectionIt
private MMovement reverse(boolean accrual) protected MMovement reverse(boolean accrual)
{ {
Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate(); Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
if (reversalDate == null) { if (reversalDate == null) {
@ -1014,13 +1014,13 @@ public class MMovement extends X_M_Movement implements DocAction
} // getC_Currency_ID } // getC_Currency_ID
/** Reversal Flag */ /** Reversal Flag */
private boolean m_reversal = false; protected boolean m_reversal = false;
/** /**
* Set Reversal * Set Reversal
* @param reversal reversal * @param reversal reversal
*/ */
private void setReversal(boolean reversal) protected void setReversal(boolean reversal)
{ {
m_reversal = reversal; m_reversal = reversal;
} // setReversal } // setReversal
@ -1028,7 +1028,7 @@ public class MMovement extends X_M_Movement implements DocAction
* Is Reversal * Is Reversal
* @return reversal * @return reversal
*/ */
private boolean isReversal() protected boolean isReversal()
{ {
return m_reversal; return m_reversal;
} // isReversal } // isReversal

22
org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
View File

@ -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 * Create Confirmation or return existing one
@ -127,15 +127,15 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
} // MInOutConfirm } // MInOutConfirm
/** Confirm Lines */ /** Confirm Lines */
private MMovementLineConfirm[] m_lines = null; protected MMovementLineConfirm[] m_lines = null;
/** Physical Inventory From */ /** Physical Inventory From */
private MInventory m_inventoryFrom = null; protected MInventory m_inventoryFrom = null;
/** Physical Inventory To */ /** Physical Inventory To */
private MInventory m_inventoryTo = null; protected MInventory m_inventoryTo = null;
/** Physical Inventory Info */ /** Physical Inventory Info */
private String m_inventoryInfo = null; protected String m_inventoryInfo = null;
private List<MInventory> m_inventoryDoc = null; protected List<MInventory> m_inventoryDoc = null;
/** /**
* Get Lines * Get Lines
@ -264,9 +264,9 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
} // processIt } // processIt
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -468,7 +468,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
* @param confirm confirm line * @param confirm confirm line
* @return true if created * @return true if created
*/ */
private boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm) protected boolean createDifferenceDoc (MMovement move, MMovementLineConfirm confirm)
{ {
MMovementLine mLine = confirm.getLine(); 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) if (m_processMsg != null)
m_processMsg = m_processMsg + " " + msg; m_processMsg = m_processMsg + " " + msg;
else else
@ -581,7 +581,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
/** /**
* @param inventory * @param inventory
*/ */
private void setInventoryDocType(MInventory inventory) { protected void setInventoryDocType(MInventory inventory) {
MDocType[] doctypes = MDocType.getOfDocBaseType(Env.getCtx(), X_C_DocType.DOCBASETYPE_MaterialPhysicalInventory); MDocType[] doctypes = MDocType.getOfDocBaseType(Env.getCtx(), X_C_DocType.DOCBASETYPE_MaterialPhysicalInventory);
for(MDocType doctype : doctypes) for(MDocType doctype : doctypes)
{ {

4
org.adempiere.base/src/org/compiere/model/MMovementLine.java
View File

@ -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 * Standard Cosntructor
@ -144,7 +144,7 @@ public class MMovementLine extends X_M_MovementLine
} // setMovementQty } // setMovementQty
/** Parent */ /** Parent */
private MMovement m_parent = null; protected MMovement m_parent = null;
/** /**
* get Parent * get Parent

4
org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
View File

@ -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 * Standard Constructor
@ -79,7 +79,7 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm
} // MMovementLineConfirm } // MMovementLineConfirm
/** Movement Line */ /** Movement Line */
private MMovementLine m_line = null; protected MMovementLine m_line = null;
/** /**
* Set Movement Line * Set Movement Line

20
org.adempiere.base/src/org/compiere/model/MProduction.java
View File

@ -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 */ /** Log */
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static CLogger m_log = CLogger.getCLogger (MProduction.class); protected static CLogger m_log = CLogger.getCLogger (MProduction.class);
private int lineno; protected int lineno;
private int count; protected int count;
public MProduction(Properties ctx, int M_Production_ID, String trxName) { public MProduction(Properties ctx, int M_Production_ID, String trxName) {
super(ctx, M_Production_ID, trxName); super(ctx, M_Production_ID, trxName);
@ -164,7 +164,7 @@ public class MProduction extends X_M_Production implements DocAction {
return false; return false;
} }
private Object processLines(MProductionLine[] lines) { protected Object processLines(MProductionLine[] lines) {
StringBuilder errors = new StringBuilder(); StringBuilder errors = new StringBuilder();
for ( int i = 0; i<lines.length; i++) { for ( int i = 0; i<lines.length; i++) {
String error = lines[i].createTransactions(getMovementDate(), false); String error = lines[i].createTransactions(getMovementDate(), false);
@ -247,7 +247,7 @@ public class MProduction extends X_M_Production implements DocAction {
return count; return count;
} }
private int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) { protected int createLines(boolean mustBeStocked, MProduct finishedProduct, BigDecimal requiredQty) {
int defaultLocator = 0; int defaultLocator = 0;
@ -453,9 +453,9 @@ public class MProduction extends X_M_Production implements DocAction {
} }
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
@Override @Override
public boolean unlockIt() { public boolean unlockIt() {
@ -703,7 +703,7 @@ public class MProduction extends X_M_Production implements DocAction {
return true; return true;
} }
private MProduction reverse(boolean accrual) { protected MProduction reverse(boolean accrual) {
Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate(); Timestamp reversalDate = accrual ? Env.getContextAsDate(getCtx(), "#Date") : getMovementDate();
if (reversalDate == null) { if (reversalDate == null) {
reversalDate = new Timestamp(System.currentTimeMillis()); reversalDate = new Timestamp(System.currentTimeMillis());
@ -760,7 +760,7 @@ public class MProduction extends X_M_Production implements DocAction {
return reversal; return reversal;
} }
private MProduction copyFrom(Timestamp reversalDate) { protected MProduction copyFrom(Timestamp reversalDate) {
MProduction to = new MProduction(getCtx(), 0, get_TrxName()); MProduction to = new MProduction(getCtx(), 0, get_TrxName());
PO.copyValues (this, to, getAD_Client_ID(), getAD_Org_ID()); PO.copyValues (this, to, getAD_Client_ID(), getAD_Org_ID());

8
org.adempiere.base/src/org/compiere/model/MProductionLine.java
View File

@ -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) { if (productionParent != null) {
return productionParent.getM_Product_ID(); return productionParent.getM_Product_ID();
} else if (getM_Production_ID() > 0) { } 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(); String sql = "DELETE FROM M_ProductionLineMA WHERE M_ProductionLine_ID = " + get_ID();
int count = DB.executeUpdateEx( sql, get_TrxName() ); int count = DB.executeUpdateEx( sql, get_TrxName() );
return count; return count;

16
org.adempiere.base/src/org/compiere/model/MRMA.java
View File

@ -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 * Standard Constructor
@ -83,11 +83,11 @@ public class MRMA extends X_M_RMA implements DocAction
} // MRMA } // MRMA
/** Lines */ /** Lines */
private MRMALine[] m_lines = null; protected MRMALine[] m_lines = null;
/** Tax Lines */ /** Tax Lines */
private MRMATax[] m_taxes = null; protected MRMATax[] m_taxes = null;
/** The Shipment */ /** The Shipment */
private MInOut m_inout = null; protected MInOut m_inout = null;
/** /**
* Get Lines * Get Lines
@ -300,9 +300,9 @@ public class MRMA extends X_M_RMA implements DocAction
} // process } // process
/** Process Message */ /** Process Message */
private String m_processMsg = null; protected String m_processMsg = null;
/** Just Prepared Flag */ /** Just Prepared Flag */
private boolean m_justPrepared = false; protected boolean m_justPrepared = false;
/** /**
* Unlock Document. * Unlock Document.
@ -474,7 +474,7 @@ public class MRMA extends X_M_RMA implements DocAction
/** /**
* Set the definite document number after completed * Set the definite document number after completed
*/ */
private void setDefiniteDocumentNo() { protected void setDefiniteDocumentNo() {
MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), getC_DocType_ID());
/* No Document Date on RMA /* No Document Date on RMA
if (dt.isOverwriteDateOnComplete()) { if (dt.isOverwriteDateOnComplete()) {
@ -492,7 +492,7 @@ public class MRMA extends X_M_RMA implements DocAction
* Create Counter Document * Create Counter Document
* @return InOut * @return InOut
*/ */
private MRMA createCounterDoc() protected MRMA createCounterDoc()
{ {
// Is this a counter doc ? // Is this a counter doc ?
if (getRef_RMA_ID() > 0) if (getRef_RMA_ID() > 0)

24
org.adempiere.base/src/org/compiere/model/MRMALine.java
View File

@ -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 * Standard Constructor
@ -73,25 +73,25 @@ public class MRMALine extends X_M_RMALine
} // MRMALine } // MRMALine
/** Shipment Line */ /** Shipment Line */
private MInOutLine m_ioLine = null; protected MInOutLine m_ioLine = null;
/** Product */ /** Product */
private MProduct m_product = null; protected MProduct m_product = null;
/** Charge */ /** Charge */
private MCharge m_charge = null; protected MCharge m_charge = null;
/** Tax */ /** Tax */
private MTax m_tax = null; protected MTax m_tax = null;
/** Parent */ /** Parent */
private MRMA m_parent = null; protected MRMA m_parent = null;
private int precision = 0; protected int precision = 0;
private BigDecimal unitAmount = Env.ZERO; protected BigDecimal unitAmount = Env.ZERO;
private BigDecimal originalQty = Env.ZERO; protected BigDecimal originalQty = Env.ZERO;
private int taxId = 0; protected int taxId = 0;
/** /**
* Initialise parameters that are required * Initialise parameters that are required
*/ */
private void init() protected void init()
{ {
getShipLine(); getShipLine();
@ -223,7 +223,7 @@ public class MRMALine extends X_M_RMALine
* Retrieves the invoiceLine Id associated with the Shipment/Receipt Line * Retrieves the invoiceLine Id associated with the Shipment/Receipt Line
* @return Invoice Line ID * @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()) int invoiceLine_ID = new Query(getCtx(), I_C_InvoiceLine.Table_Name, "M_InOutLine_ID=?", get_TrxName())
.setParameters(getM_InOutLine_ID()) .setParameters(getM_InOutLine_ID())

6
org.adempiere.base/src/org/compiere/model/MUOM.java
View File

@ -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 */ /** X12 Element 355 Code Second */
public static final String X12_SECOND = "03"; public static final String X12_SECOND = "03";
/** X12 Element 355 Code Minute */ /** X12 Element 355 Code Minute */
@ -97,7 +97,7 @@ public class MUOM extends X_C_UOM
/*************************************************************************/ /*************************************************************************/
/** UOM Cache */ /** 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 * Get UOM from Cache
@ -150,7 +150,7 @@ public class MUOM extends X_C_UOM
* Load All UOMs * Load All UOMs
* @param ctx context * @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) List<MUOM> list = new Query(ctx, Table_Name, "IsActive='Y'", null)
.setApplyAccessFilter(MRole.SQL_NOTQUALIFIED, MRole.SQL_RO) .setApplyAccessFilter(MRole.SQL_NOTQUALIFIED, MRole.SQL_RO)

12
org.adempiere.base/src/org/compiere/model/MUOMConversion.java
View File

@ -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 * @param p Point with from(x) - to(y) C_UOM_ID
* @return conversion multiplier or null * @return conversion multiplier or null
*/ */
static private BigDecimal getRate (Properties ctx, Point p) static protected BigDecimal getRate (Properties ctx, Point p)
{ {
BigDecimal retValue = null; BigDecimal retValue = null;
if (Ini.isClient()) if (Ini.isClient())
@ -167,7 +167,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
* Create Conversion Matrix (Client) * Create Conversion Matrix (Client)
* @param ctx context * @param ctx context
*/ */
private static void createRates (Properties ctx) protected static void createRates (Properties ctx)
{ {
s_conversions = new CCache<Point,BigDecimal>(Table_Name, 20); s_conversions = new CCache<Point,BigDecimal>(Table_Name, 20);
// //
@ -631,11 +631,11 @@ public class MUOMConversion extends X_C_UOM_Conversion
/** Static Logger */ /** Static Logger */
private static final CLogger s_log = CLogger.getCLogger(MUOMConversion.class); private static final CLogger s_log = CLogger.getCLogger(MUOMConversion.class);
/** Indicator for Rate */ /** 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 */ /** 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 */ /** 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); = new CCache<Integer,MUOMConversion[]>(Table_Name, Table_Name+"_Of_Product", 20);

6
org.adempiere.base/src/org/compiere/model/MWarehouse.java
View File

@ -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 * Get from Cache
@ -109,7 +109,7 @@ public class MWarehouse extends X_M_Warehouse
} // get } // get
/** Cache */ /** 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 * Standard Constructor
* @param ctx context * @param ctx context
@ -154,7 +154,7 @@ public class MWarehouse extends X_M_Warehouse
} // MWarehouse } // MWarehouse
/** Warehouse Locators */ /** Warehouse Locators */
private MLocator[] m_locators = null; protected MLocator[] m_locators = null;
/** /**
* Get Locators * Get Locators