Merge branch 'develop' into feature/adempiere#1697-Add-Row-Style-Change

erpcya · Oct 3, 2018 · 05c7f41 · 05c7f41
2 parents 7cb583c + 87648d3
commit 05c7f41
Show file tree

Hide file tree

Showing 32 changed files with 9,110 additions and 437 deletions.
diff --git a/base/src/org/compiere/impexp/OFXBankStatementHandler.java b/base/src/org/compiere/impexp/OFXBankStatementHandler.java
@@ -31,6 +31,7 @@
 
 import org.compiere.model.MBankStatementLoader;
 import org.compiere.util.Env;
+import org.compiere.util.Util;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -750,6 +751,13 @@ private Timestamp parseOfxDate(String value) throws ParseException
 	{
 		try
 		{
+			if(Util.isEmpty(value)) {
+				return null;
+			}
+			//	Validate length
+			if(value.length() > 8) {
+				value = value.substring(0, 8);
+			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 			sdf.setLenient(false);
 			return new Timestamp (sdf.parse(value).getTime());

diff --git a/base/src/org/compiere/model/MBankStatementLine.java b/base/src/org/compiere/model/MBankStatementLine.java
@@ -22,6 +22,7 @@
 import java.sql.Timestamp;
 import java.util.Properties;
 
+import org.adempiere.exceptions.AdempiereException;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
@@ -38,6 +39,9 @@
  * @author Teo Sarca, SC ARHIPAC SERVICE SRL
  * 			<li>BF [ 1896880 ] Unlink Payment if TrxAmt is zero
  * 			<li>BF [ 1896885 ] BS Line: don't update header if after save/delete fails
+ * @author Yamel Senih, ysenih@erpya.com , http://www.erpya.com
+ *  	<li> FR [ 1699 ] Add support view for Bank Statement
+ *  	@see https://github.com/adempiere/adempiere/issues/1699
  */
  public class MBankStatementLine extends X_C_BankStatementLine
  {
@@ -93,6 +97,58 @@ public MBankStatementLine(MBankStatement statement)
 		setC_BankStatement_ID(statement.getC_BankStatement_ID());
 		setStatementLineDate(statement.getStatementDate());
 	}	//	MBankStatementLine
+
+	/**
+	 * Create from import
+	 * @param statement
+	 * @param imp
+	 */
+	public MBankStatementLine(MBankStatement statement, X_I_BankStatement imp, int lineNo) {
+		this(statement);
+		//	Parent values
+		MBankAccount account = MBankAccount.get(getCtx(), statement.getC_BankAccount_ID());
+		if(account == null) {
+			throw new AdempiereException("@C_BankAccount_ID@ @NotFound@");
+		}
+		//	set import values
+		setReferenceNo(imp.getReferenceNo());
+		setDescription(imp.getLineDescription());
+		setStatementLineDate(imp.getStatementLineDate());
+		setDateAcct(imp.getStatementLineDate());
+		if(imp.getValutaDate() != null) {
+			setValutaDate(imp.getValutaDate());
+		}
+		setIsReversal(imp.isReversal());
+		if(imp.getC_Currency_ID() != 0) {
+			setC_Currency_ID(imp.getC_Currency_ID());
+		} else {
+			setC_Currency_ID(account.getC_Currency_ID());
+		}
+		setTrxAmt(imp.getTrxAmt());
+		setStmtAmt(imp.getStmtAmt());
+		if (imp.getC_Charge_ID() != 0) {
+			setC_Charge_ID(imp.getC_Charge_ID());
+		}
+		setInterestAmt(imp.getInterestAmt());
+		setChargeAmt(imp.getChargeAmt());
+		setMemo(imp.getMemo());
+		if (imp.getC_Payment_ID() != 0) {
+			setC_Payment_ID(imp.getC_Payment_ID());
+		}
+		//	Copy statement line reference data
+		setEftTrxID(imp.getEftTrxID());
+		setEftTrxType(imp.getEftTrxType());
+		setEftCheckNo(imp.getEftCheckNo());
+		setEftReference(imp.getEftReference());
+		setEftMemo(imp.getEftMemo());
+		setEftPayee(imp.getEftPayee());
+		setEftPayeeAccount(imp.getEftPayeeAccount());
+		setEftStatementLineDate(imp.getEftStatementLineDate());
+		setEftValutaDate(imp.getEftValutaDate());
+		setEftCurrency(imp.getEftCurrency());
+		setEftAmt(imp.getEftAmt());
+		setLine(lineNo);
+	}
 
 	/**
 	 * 	Parent Constructor