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

IDEMPIERE-983 Cannot print cash payments generated

This commit is contained in:
Carlos Ruiz 2013-05-29 12:18:23 -05:00
parent 014fbc4a83
commit c8b2b44672
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql Normal file
View File

@ -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
;

8
migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql Normal file
View File

@ -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
;

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

@ -108,9 +108,9 @@ public final class MPaySelectionCheck extends X_C_PaySelectionCheck
PaymentRule = PAYMENTRULE_DirectDebit; PaymentRule = PAYMENTRULE_DirectDebit;
else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_DirectDeposit)) else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_DirectDeposit))
PaymentRule = PAYMENTRULE_DirectDeposit; PaymentRule = PAYMENTRULE_DirectDeposit;
// else if (payment.getTenderType().equals(MPayment.TENDERTYPE_Check)) else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_Cash))
// PaymentRule = MPaySelectionCheck.PAYMENTRULE_Check; PaymentRule = PAYMENTRULE_Cash;
// Create new PaySelection // Create new PaySelection
MPaySelection ps = new MPaySelection(ctx, 0, trxName); MPaySelection ps = new MPaySelection(ctx, 0, trxName);
ps.setAD_Org_ID(payment.getAD_Org_ID()); ps.setAD_Org_ID(payment.getAD_Org_ID());

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
View File

@ -511,6 +511,8 @@ public class ProcessModalDialog extends Window implements EventListener<Event>,
try { try {
if (log.isLoggable(Level.INFO))log.log(Level.INFO, "Process Info="+m_pi+" AD_Client_ID="+Env.getAD_Client_ID(Env.getCtx())); 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); WProcessCtl.process(ProcessModalDialog.this, m_WindowNo, parameterPanel, m_pi, null);
} catch (Exception ex) {
FDialog.error(m_WindowNo, ex.getLocalizedMessage());
} finally { } finally {
Executions.schedule(getDesktop(), ProcessModalDialog.this, new Event(ON_COMPLETE, ProcessModalDialog.this, null)); Executions.schedule(getDesktop(), ProcessModalDialog.this, new Event(ON_COMPLETE, ProcessModalDialog.this, null));
} }