IDEMPIERE-5459 - Adapt Swing UI to refactoring of Payment Form (#1541)

README.md

@@ -20,3 +20,9 @@
 ## Eclipse
 * at your idempiere workspace, import existing projects from idempiere-swing-client
 * run using swingclient.launch
+
+NOTE!!
+
+If you have run the server variant before, your idempiere.properties file is in the server's home directory.
+
+The Swing Client will look for your idempiere.properties in $USER_HOME

org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java

@@ -62,6 +62,8 @@
 import org.compiere.util.Msg;
 import org.compiere.util.ValueNamePair;
 
+import bsh.engine.ScriptContextEngineView;
+
 /**
  *  Create Manual Payments From (AP) Invoices or (AR) Credit Memos.
  *  Allows user to select Invoices for payment.
@@ -380,7 +382,7 @@ private void generatePaySelect()
 
 		ProcessParameterPanel pp = new ProcessParameterPanel(m_WindowNo, pi);
 		//	Execute Process
-		ProcessCtl.process(this, m_WindowNo, (IProcessParameter) pp, pi, trx);
+		ProcessCtl.process(this, m_WindowNo, (IProcessParameter) pp, pi, null);
 	//	ProcessCtl worker = new ProcessCtl(this, pi, trx);
 	//	worker.start();     //  complete tasks in unlockUI
 	}   //  generatePaySelect

org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java

@@ -129,23 +129,6 @@ public void loadData() {
 		//	Accounting Date
 		bDateField.setValue(m_DateAcct);
 
-		// Is the currency an EMU currency?
-		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
-		if (s_Currencies.containsKey(C_Currency_ID)) {
-			Enumeration<Integer> en = s_Currencies.keys();
-			while (en.hasMoreElements()) {
-				Object key = en.nextElement();
-				bCurrencyCombo.addItem(s_Currencies.get(key));
-			}
-			bCurrencyCombo.addActionListener(this);
-			bCurrencyCombo.setSelectedItem(s_Currencies.get(C_Currency_ID));
-		} 
-		else // No EMU Currency
-		{
-			bCurrencyLabel.setVisible(false); // Cash
-			bCurrencyCombo.setVisible(false);
-		}
-
 		ArrayList<KeyNamePair> list = getBankAccountList();
 		for (KeyNamePair pp : list)
 			bBankAccountCombo.addItem(pp);

org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java

@@ -130,25 +130,6 @@ public void loadData() {
 			sStatus.setText(m_mPayment.getR_PnRef());
 			sAmountField.setValue(m_mPayment.getPayAmt());
 		}
-
-		//	Is the currency an EMU currency?
-		Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID);
-		if (s_Currencies.containsKey(C_Currency_ID))
-		{
-			Enumeration<Integer> en = s_Currencies.keys();
-			while (en.hasMoreElements())
-			{
-				Object key = en.nextElement();
-				sCurrencyCombo.addItem(s_Currencies.get(key));
-			}
-			sCurrencyCombo.addActionListener(this);
-			sCurrencyCombo.setSelectedItem(s_Currencies.get(C_Currency_ID));
-		}
-		else	//	No EMU Currency
-		{
-			sCurrencyLabel.setVisible(false);	//	Check
-			sCurrencyCombo.setVisible(false);
-		}
 
 		ArrayList<KeyNamePair> list = getBankAccountList();
 		for (KeyNamePair pp : list)

org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormDirect.java

@@ -94,7 +94,7 @@ public void loadData() {
 			tStatus.setText(m_mPayment.getR_PnRef());
 		}
 
-		ArrayList<KeyNamePair> list = getBPBankAccountList();
+		ArrayList<KeyNamePair> list = getBankAccountList();
 		for (KeyNamePair pp : list)
 			tAccountCombo.addItem(pp);
 

org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormMixedPOS.java

@@ -58,4 +58,8 @@ public void closeWindow()
 	public Object getWindow() {
 		return dialog;
 	}
+
+	@Override
+	protected void afterSave(boolean success) {
+	}
 }