details: /erp/devel/pi/rev/966854b29a2b
changeset: 11472:966854b29a2b
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Apr 05 09:38:33 2011 +0200
summary: Fixes issue 16216: Actions not allowed are shown
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
| 7 +++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
| 12 +++++++--
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
| 7 +++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
| 12 +++++++--
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
| 7 +++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
| 12 +++++++--
6 files changed, 48 insertions(+), 9 deletions(-)
diffs (138 lines):
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Tue Apr 05 09:38:33 2011 +0200
@@ -87,6 +87,13 @@
}
function openProcessPayment() {
if (validate('openprocess')) {
+ var amount = document.frmMain.inpActualPayment.value;
+ // if amount is 0 deposit or withdrawn is not allowed
+ // skip action regarding document window
+ if ( compare(amount, '==', 0) ) {
+ submitThisPage('SAVEANDPROCESS');
+ return true;
+ }
document.getElementById('client_top_popup').style.display = 'block';
document.getElementById('client_top').style.display = 'none';
document.getElementById('client_middle').style.display = 'none';
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
Tue Apr 05 09:38:33 2011 +0200
@@ -133,8 +133,15 @@
}
printGLItem(response, errorMessage);
- } else if (vars.commandIn("SAVE")) {
- String strAction = vars.getRequiredStringParameter("inpActionDocument");
+ } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) {
+ boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
+ String strAction = null;
+ if (vars.commandIn("SAVEANDPROCESS")) {
+ // The default option is process
+ strAction = (isReceipt ? "PRP" : "PPP");
+ } else {
+ strAction = vars.getRequiredStringParameter("inpActionDocument");
+ }
String strPaymentId = vars.getRequiredStringParameter("inpfinPaymentId");
String strSelectedScheduledPaymentDetailIds = vars.getInParameter(
"inpScheduledPaymentDetailId", "", IsIDFilter.instance);
@@ -144,7 +151,6 @@
refundAmount = new
BigDecimal(vars.getRequiredNumericParameter("inpDifference"));
String strTabId = vars.getRequiredStringParameter("inpTabId");
String strPaymentAmount =
vars.getRequiredNumericParameter("inpActualPayment");
- boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
String strDocumentType = vars.getStringParameter("inpDocumentType", "");
OBError message = null;
// FIXME: added to access the FIN_PaymentSchedule and
FIN_PaymentScheduleDetail tables to be
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
Tue Apr 05 09:38:33 2011 +0200
@@ -102,6 +102,13 @@
}
function openProcessPayment() {
if (validate('openprocess')) {
+ var amount = document.frmMain.inpActualPayment.value;
+ // if amount is 0 deposit or withdrawn is not allowed
+ // skip action regarding document window
+ if ( compare(amount, '==', 0) ) {
+ submitThisPage('SAVEANDPROCESS');
+ return true;
+ }
document.getElementById('client_top_popup').style.display = 'block';
document.getElementById('client_top').style.display = 'none';
document.getElementById('client_middle').style.display = 'none';
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
Tue Apr 05 09:38:33 2011 +0200
@@ -126,8 +126,15 @@
String strOrgId = vars.getRequestGlobalVariable("inpadOrgId", "");
refreshPaymentMethodCombo(response, strPaymentMethodId, "", strOrgId);
- } else if (vars.commandIn("SAVE")) {
- String strAction = vars.getRequiredStringParameter("inpActionDocument");
+ } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) {
+ boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
+ String strAction = null;
+ if (vars.commandIn("SAVEANDPROCESS")) {
+ // The default option is process
+ strAction = (isReceipt ? "PRP" : "PPP");
+ } else {
+ strAction = vars.getRequiredStringParameter("inpActionDocument");
+ }
String strPaymentDocumentNo =
vars.getRequiredStringParameter("inpDocNumber");
String strReceivedFromId =
vars.getRequiredStringParameter("inpBusinessPartnerId");
String strPaymentMethodId =
vars.getRequiredStringParameter("inpPaymentMethod");
@@ -142,7 +149,6 @@
if (strDifferenceAction.equals("refund"))
refundAmount = new
BigDecimal(vars.getRequiredNumericParameter("inpDifference"));
String strTabId = vars.getRequiredStringParameter("inpTabId");
- boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
String strReferenceNo = vars.getStringParameter("inpReferenceNo", "");
OBError message = null;
// FIXME: added to access the FIN_PaymentSchedule and
FIN_PaymentScheduleDetail tables to be
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Tue Apr 05 09:38:33 2011 +0200
@@ -99,6 +99,13 @@
}
function openProcessPayment() {
if (validate('openprocess')) {
+ var amount = document.frmMain.inpActualPayment.value;
+ // if amount is 0 deposit or withdrawn is not allowed
+ // skip action regarding document window
+ if ( compare(amount, '==', 0) ) {
+ submitThisPage('SAVEANDPROCESS');
+ return true;
+ }
document.getElementById('client_top_popup').style.display = 'block';
document.getElementById('client_top').style.display = 'none';
document.getElementById('client_middle').style.display = 'none';
diff -r 66638c109547 -r 966854b29a2b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Tue Apr 05 09:33:11 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Tue Apr 05 09:38:33 2011 +0200
@@ -110,8 +110,15 @@
out.println(customerCredit);
out.close();
- } else if (vars.commandIn("SAVE")) {
- String strAction = vars.getRequiredStringParameter("inpActionDocument");
+ } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) {
+ boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
+ String strAction = null;
+ if (vars.commandIn("SAVEANDPROCESS")) {
+ // The default option is process
+ strAction = (isReceipt ? "PRP" : "PPP");
+ } else {
+ strAction = vars.getRequiredStringParameter("inpActionDocument");
+ }
String strPaymentDocumentNo =
vars.getRequiredStringParameter("inpDocNumber");
String strReceivedFromId =
vars.getRequiredStringParameter("inpcBpartnerId");
String strPaymentMethodId =
vars.getRequiredStringParameter("inpPaymentMethod");
@@ -124,7 +131,6 @@
BigDecimal refundAmount = BigDecimal.ZERO;
if (strDifferenceAction.equals("refund"))
refundAmount = new
BigDecimal(vars.getRequiredNumericParameter("inpDifference"));
- boolean isReceipt =
vars.getRequiredStringParameter("isReceipt").equals("Y");
String strReferenceNo = vars.getStringParameter("inpReferenceNo", "");
OBError message = null;
// FIXME: added to access the FIN_PaymentSchedule and
FIN_PaymentScheduleDetail tables to be
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
