diff --git a/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql b/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql new file mode 100644 index 0000000000..9aa4e10c74 --- /dev/null +++ b/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql @@ -0,0 +1,8 @@ +-- May 29, 2013 11:54:03 AM COT +-- IDEMPIERE-983 Cannot print cash payments generated +UPDATE AD_Column SET AD_Val_Rule_ID=52033,Updated=TO_DATE('2013-05-29 11:54:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5637 +; + +SELECT register_migration_script('201305291158_IDEMPIERE-983.sql') FROM dual +; + diff --git a/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql b/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql new file mode 100644 index 0000000000..c59da724aa --- /dev/null +++ b/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql @@ -0,0 +1,8 @@ +-- May 29, 2013 11:54:03 AM COT +-- IDEMPIERE-983 Cannot print cash payments generated +UPDATE AD_Column SET AD_Val_Rule_ID=52033,Updated=TO_TIMESTAMP('2013-05-29 11:54:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5637 +; + +SELECT register_migration_script('201305291158_IDEMPIERE-983.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java index 9386417a2c..803d0a6408 100644 --- a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java +++ b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java @@ -108,9 +108,9 @@ public final class MPaySelectionCheck extends X_C_PaySelectionCheck PaymentRule = PAYMENTRULE_DirectDebit; else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_DirectDeposit)) PaymentRule = PAYMENTRULE_DirectDeposit; - // else if (payment.getTenderType().equals(MPayment.TENDERTYPE_Check)) - // PaymentRule = MPaySelectionCheck.PAYMENTRULE_Check; - + else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_Cash)) + PaymentRule = PAYMENTRULE_Cash; + // Create new PaySelection MPaySelection ps = new MPaySelection(ctx, 0, trxName); ps.setAD_Org_ID(payment.getAD_Org_ID()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index c27ce6f787..7ea413b0a6 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -511,6 +511,8 @@ public class ProcessModalDialog extends Window implements EventListener, try { if (log.isLoggable(Level.INFO))log.log(Level.INFO, "Process Info="+m_pi+" AD_Client_ID="+Env.getAD_Client_ID(Env.getCtx())); WProcessCtl.process(ProcessModalDialog.this, m_WindowNo, parameterPanel, m_pi, null); + } catch (Exception ex) { + FDialog.error(m_WindowNo, ex.getLocalizedMessage()); } finally { Executions.schedule(getDesktop(), ProcessModalDialog.this, new Event(ON_COMPLETE, ProcessModalDialog.this, null)); }