Merge pull request #1631 from e-Evolution/develop

Tests passed. Synchronize e-Evolution develop branch with ADempiere develop branch.
adempiere · Apr 13, 2018 · a7e61e5 · a7e61e5
2 parents 2d22cc5 + b5d78f2
commit a7e61e5
Show file tree

Hide file tree

Showing 56 changed files with 6,153 additions and 6,430 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/libraries/org_scalatest_scalatest_2_12_3_0_5.xml b/.idea/libraries/org_scalatest_scalatest_2_12_3_0_5.xml
diff --git a/.idea/libraries/scala_sdk_2_12_4.xml b/.idea/libraries/scala_sdk_2_12_4.xml
diff --git a/.idea/scala_settings.xml b/.idea/scala_settings.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/adempiere.iml b/adempiere.iml
@@ -206,11 +206,7 @@
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.pos/src/main/java/base" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.pos/src/main/java/ui/swing" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.pos/src/main/java/ui/zk" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/org.adempiere.request/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/org.adempiere.project/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.request/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/org.adempiere.project/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/org.adempiere.crm/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
@@ -986,78 +982,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="aspectjlib.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/reference/aspectJ/aspectjlib.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="aspectjtools.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/reference/aspectJ/aspectjtools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="aspectjweaver.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/reference/aspectJ/aspectjweaver.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="struts.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/struts.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="aop.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/aop.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="aspectjrt.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/aspectjrt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="barcode4j.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/barcode4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="commons-validator.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/commons-validator.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library name="spiffy-with_source-all-0.05.jar">
         <CLASSES>
@@ -1103,15 +1027,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="displaytag-1.1.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/displaytag-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library name="zweb.jar">
         <CLASSES>
@@ -1130,33 +1045,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="displaytag-export-poi-1.1.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="log4j-1.2.13.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/log4j-1.2.13.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="servlet.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/posterita/posterita/web/WEB-INF/lib/servlet.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library name="iText-2.1.7.jar">
         <CLASSES>
@@ -1420,8 +1308,5 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="scala-sdk-2.12.3" level="application" />
-    <orderEntry type="library" name="customization" level="project" />
-    <orderEntry type="library" name="org.scalatest:scalatest_2.12:3.0.2" level="project" />
   </component>
 </module>
diff --git a/base/src/org/compiere/model/I_C_DocType.java b/base/src/org/compiere/model/I_C_DocType.java
@@ -120,6 +120,21 @@ public interface I_C_DocType
 
 	public org.compiere.model.I_C_DocType getC_DocTypeInvoice() throws RuntimeException;
 
+    /** Column name C_DocTypePayment_ID */
+    public static final String COLUMNNAME_C_DocTypePayment_ID = "C_DocTypePayment_ID";
+
+	/** Set Document Type for Payment.
+	  * Document type used for Payments generated from this Pay Selection document
+	  */
+	public void setC_DocTypePayment_ID (int C_DocTypePayment_ID);
+
+	/** Get Document Type for Payment.
+	  * Document type used for Payments generated from this Pay Selection document
+	  */
+	public int getC_DocTypePayment_ID();
+
+	public org.compiere.model.I_C_DocType getC_DocTypePayment() throws RuntimeException;
+
     /** Column name C_DocTypeProforma_ID */
     public static final String COLUMNNAME_C_DocTypeProforma_ID = "C_DocTypeProforma_ID";
 

diff --git a/base/src/org/compiere/model/MPaySelectionCheck.java b/base/src/org/compiere/model/MPaySelectionCheck.java
@@ -314,9 +314,11 @@ public static int confirmPrint (List<MPaySelectionCheck> paySelectionChecks, MPa
 			}
 			else	//	New Payment
 			{
+				I_C_PaySelection paySelection =  paySelectionCheck.getC_PaySelection();
+				Integer docTypeId = paySelection.getC_DocType().getC_DocTypePayment_ID();
+
 				payment = new MPayment(paySelectionCheck.getCtx(), 0, paySelectionCheck.get_TrxName());
 				payment.setAD_Org_ID(paySelectionCheck.getAD_Org_ID());
-				//
 				if (paySelectionCheck.getPaymentRule().equals(PAYMENTRULE_Check))
 					payment.setBankCheck (paySelectionCheck.getParent().getC_BankAccount_ID(), false, paySelectionCheck.getDocumentNo());
 				else if (paySelectionCheck.getPaymentRule().equals(PAYMENTRULE_CreditCard))
@@ -330,7 +332,11 @@ else if (paySelectionCheck.getPaymentRule().equals(PAYMENTRULE_DirectDeposit)
 					throw  new AdempiereException("Unsupported Payment Rule=" + paySelectionCheck.getPaymentRule());
 					//continue;
 				}
+
 				payment.setTrxType(X_C_Payment.TRXTYPE_CreditPayment);
+				if (docTypeId != null && docTypeId > 0)
+					payment.setC_DocType_ID(docTypeId);
+
 				payment.setAmount(paySelectionCheck.getParent().getC_Currency_ID(), paySelectionCheck.getPayAmt());
 				payment.setDiscountAmt(paySelectionCheck.getDiscountAmt());
 				payment.setDateTrx(paySelectionCheck.getParent().getPayDate());

diff --git a/base/src/org/compiere/model/X_C_DocType.java b/base/src/org/compiere/model/X_C_DocType.java
@@ -30,7 +30,7 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20171031L;
+	private static final long serialVersionUID = 20180409L;
 
     /** Standard Constructor */
     public X_C_DocType (Properties ctx, int C_DocType_ID, String trxName)
@@ -199,6 +199,34 @@ public int getC_DocTypeInvoice_ID ()
 		return ii.intValue();
 	}
 
+	public org.compiere.model.I_C_DocType getC_DocTypePayment() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+			.getPO(getC_DocTypePayment_ID(), get_TrxName());	}
+
+	/** Set Document Type for Payment.
+		@param C_DocTypePayment_ID 
+		Document type used for Payments generated from this Pay Selection document
+	  */
+	public void setC_DocTypePayment_ID (int C_DocTypePayment_ID)
+	{
+		if (C_DocTypePayment_ID < 1) 
+			set_Value (COLUMNNAME_C_DocTypePayment_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_DocTypePayment_ID, Integer.valueOf(C_DocTypePayment_ID));
+	}
+
+	/** Get Document Type for Payment.
+		@return Document type used for Payments generated from this Pay Selection document
+	  */
+	public int getC_DocTypePayment_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocTypePayment_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_C_DocType getC_DocTypeProforma() throws RuntimeException
     {
 		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)

diff --git a/base/src/org/compiere/process/ImportBPartner.java b/base/src/org/compiere/process/ImportBPartner.java
@@ -99,7 +99,7 @@ else if (name.equals("IsValidateOnly"))
 	 *  @return Message
 	 *  @throws Exception
 	 */
-	protected String doIt() throws java.lang.Exception
+	protected String doIt() throws Exception
 	{
 		StringBuilder sql = null;
 		int no = 0;
@@ -257,7 +257,8 @@ protected String doIt() throws java.lang.Exception
 		sql = new StringBuilder ("UPDATE I_BPartner i "
 				+ "SET C_BPartner_ID="
 				+ "(SELECT C_BPartner_ID FROM AD_User u "
-				+ "WHERE i.EMail=u.EMail AND u.AD_Client_ID=i.AD_Client_ID) "
+				+ "WHERE i.EMail=u.EMail AND u.AD_Client_ID=i.AD_Client_ID "
+				+ "AND EXISTS (SELECT 1 FROM C_BPartner bp WHERE pb.C_BPartner_ID = u.C_BPartner_ID AND bp.Value = i.Value)) "
 				+ "WHERE i.EMail IS NOT NULL AND I_IsImported='N'").append(clientCheck);
 		no = DB.executeUpdateEx(sql.toString(), get_TrxName());
 		log.fine("Found EMail User=" + no);

diff --git a/...rocess/RequestEMailProcessorAbstract.java → ...rocess/RequestEMailProcessorAbstract.java b/...rocess/RequestEMailProcessorAbstract.java → ...rocess/RequestEMailProcessorAbstract.java
diff --git a/base/src/org/eevolution/service/ScanBar.java b/base/src/org/eevolution/service/ScanBar.java
@@ -165,7 +165,7 @@ public boolean isLot() {
 			if (product.getM_AttributeSet_ID() > 0) {
 				attributeSet = (MAttributeSet) product.getM_AttributeSet();
 				isLot = attributeSet.isLot();
-				boolean isExcludeEntry = attributeSet.excludeEntry(getTable().getAD_Table_ID(), Env.isSOTrx(product.getCtx()));
+				boolean isExcludeEntry = attributeSet.excludeEntry(getTableLine().getAD_Table_ID(), Env.isSOTrx(product.getCtx()));
 				if (isExcludeEntry)
 					isLot = false;
 			} else
@@ -182,7 +182,7 @@ public boolean isSerNo() {
 				attributeSet = (MAttributeSet) product.getM_AttributeSet();
 				isSerNo = attributeSet.isSerNo();
 				isSerNoMandotory = attributeSet.isSerNoMandatory();
-				boolean isExcludeEntry = attributeSet.excludeEntry(getTable().getAD_Table_ID(), Env.isSOTrx(product.getCtx()));
+				boolean isExcludeEntry = attributeSet.excludeEntry(getTableLine().getAD_Table_ID(), Env.isSOTrx(product.getCtx()));
 				if (isExcludeEntry)
 					isSerNo = false;
 			} else