details: /erp/devel/pi/rev/8d393776fe1f
changeset: 11844:8d393776fe1f
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 28 11:28:48 2011 +0200
summary: Open add payment and add transaction processes on modal windows.
details: /erp/devel/pi/rev/16547695022a
changeset: 11845:16547695022a
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue May 03 16:53:23 2011 +0200
summary: Added inpOB3UIMode parameter on callouts calls from FIC to
differentiate from classic mode calls.
details: /erp/devel/pi/rev/78a7b678d239
changeset: 11846:78a7b678d239
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue May 03 16:54:03 2011 +0200
summary: Implement JSEXECUTE on SE_FinancialAccount_BSAccounts callout to be
used on new mode.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
| 2 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
| 2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 1 +
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
| 81 ++++-----
4 files changed, 42 insertions(+), 44 deletions(-)
diffs (180 lines):
diff -r 006c8a125770 -r 78a7b678d239
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
Tue May 03 16:40:19 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
Tue May 03 16:54:03 2011 +0200
@@ -878,7 +878,7 @@
</td>
<td>
<BUTTON type="button" id="AddPayment" class="ButtonLink"
- onclick="openServletNewWindow('DEFAULT', false,
'../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromTransaction.html',
'ADDPAYMENT', '4A059E4F79294640AD37B1B718C56E5D', false,600, 900, null, null,
false, true); return false;"
+ onclick="openServletNewWindow('DEFAULT', false,
'../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromTransaction.html',
'ADDPAYMENT', '4A059E4F79294640AD37B1B718C56E5D', false,600, 900, null, null,
false, true, true); return false;"
onfocus="buttonEvent('onfocus', this);
window.status='AddPayment'; return true;"
onblur="buttonEvent('onblur', this);"
onkeyup="buttonEvent('onkeyup', this);"
onkeydown="buttonEvent('onkeydown', this);"
diff -r 006c8a125770 -r 78a7b678d239
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
Tue May 03 16:40:19 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
Tue May 03 16:54:03 2011 +0200
@@ -121,7 +121,7 @@
}
function openAddTransaction(bankStatementLineId){
document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId;
- openServletNewWindow('DEFAULT', false,
'../org.openbravo.advpaymentmngt.ad_actionbutton/AddTransaction.html',
'ADDTRANSACTION', '2EED9BC16DB34D2B80BA40A21564BECF', false,600, 900, null,
null, false, true);
+ openServletNewWindow('DEFAULT', false,
'../org.openbravo.advpaymentmngt.ad_actionbutton/AddTransaction.html',
'ADDTRANSACTION', '2EED9BC16DB34D2B80BA40A21564BECF', false,600, 900, null,
null, false, true, true);
return true;
}
</script>
diff -r 006c8a125770 -r 78a7b678d239
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue May 03 16:40:19 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue May 03 16:54:03 2011 +0200
@@ -915,6 +915,7 @@
RequestContext rq = RequestContext.get();
RequestContext.get().setRequestParameter("inpLastFieldChanged",
lastFieldChanged);
+ RequestContext.get().setRequestParameter("inpOB3UIMode", "Y");
// We then execute the callout
CalloutServletConfig config = new
CalloutServletConfig(calloutClassName, RequestContext
diff -r 006c8a125770 -r 78a7b678d239
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
---
a/src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
Tue May 03 16:40:19 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
Tue May 03 16:54:03 2011 +0200
@@ -20,17 +20,15 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.List;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.filter.IsIDFilter;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.financialmgmt.accounting.coa.AccountingCombination;
@@ -50,26 +48,24 @@
ServletException {
VariablesSecureApp vars = new VariablesSecureApp(request);
if (vars.commandIn("DEFAULT")) {
- String strChanged = vars.getStringParameter("inpLastFieldChanged");
- if (log4j.isDebugEnabled())
- log4j.debug("CHANGED: " + strChanged);
- String strWindowId = vars.getStringParameter("inpwindowId");
- String strTabId = vars.getStringParameter("inpTabId");
+ final String strChanged = vars.getStringParameter("inpLastFieldChanged");
+ log4j.debug("CHANGED: " + strChanged);
+ final String strfinFinancialAccountId =
vars.getStringParameter("inpfinFinancialAccountId",
+ IsIDFilter.instance);
try {
- printPage(response, vars, strWindowId, strTabId);
+ printPage(response, vars, strChanged, strfinFinancialAccountId);
} catch (ServletException ex) {
pageErrorCallOut(response);
}
} else if (vars.commandIn("EXECUTE")) {
- String strWindowId = vars.getStringParameter("inpwindowId");
- String strTabId = vars.getStringParameter("inpTabId");
- String strfinTransitoryAcct =
vars.getStringParameter("inpfinTransitoryAcct");
- String strfinFinancialAccountId =
vars.getStringParameter("inpfinFinancialAccountId");
- String strAccountingSchemaId =
vars.getStringParameter("inpcAcctschemaId");
+ final String strfinTransitoryAcct =
vars.getStringParameter("inpfinTransitoryAcct",
+ IsIDFilter.instance);
+ final String strfinFinancialAccountId =
vars.getStringParameter("inpfinFinancialAccountId",
+ IsIDFilter.instance);
try {
- updatePaymentMethodConfiguration(strfinFinancialAccountId,
strAccountingSchemaId);
- printPageResponse(response, vars, strWindowId, strTabId,
strfinTransitoryAcct);
+ updatePaymentMethodConfiguration(strfinFinancialAccountId);
+ printPageResponse(response, strfinTransitoryAcct);
} catch (ServletException ex) {
pageErrorCallOut(response);
}
@@ -77,27 +73,35 @@
pageError(response);
}
- private void printPage(HttpServletResponse response, VariablesSecureApp
vars, String strWindowId,
- String strTabId) throws IOException, ServletException {
- if (log4j.isDebugEnabled())
- log4j.debug("Output: dataSheet");
+ private void printPage(HttpServletResponse response, VariablesSecureApp
vars, String strChanged,
+ String strFinancialAccountId) throws IOException, ServletException {
+ log4j.debug("Output: dataSheet");
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
- String strChanged = vars.getStringParameter("inpLastFieldChanged");
- // String strfinTransitoryAcct =
vars.getStringParameter("inpfinTransitoryAcct");
- String strfinTransitoryAcct = "";
+ String strOB3UIMode = vars.getStringParameter("inpOB3UIMode", "N");
+ String strfinTransitoryAcct =
vars.getStringParameter("inpfinTransitoryAcct",
+ IsIDFilter.instance);
StringBuffer resultado = new StringBuffer();
if ("inpfinTransitoryAcct".equals(strChanged) &&
!"".equals(strfinTransitoryAcct)) {
resultado.append("var
calloutName='SE_FinancialAccount_BSAccounts';\n\n");
resultado.append("var respuesta = new Array(");
- String strScript = "(function(){var confirmation = confirm(\'"
- + Utility.messageBD(this, "BankStatementAccountWarning",
vars.getLanguage()).replaceAll(
- "\\\\n", "\\\\\\\\n")
- + "\'); if(confirmation){submitCommandFormParameter(\'EXECUTE\',
frmMain.inpLastFieldChanged, \'"
- + strChanged
- + "\', false, null,
\'../ad_callouts/SE_FinancialAccount_BSAccounts.html\', \'hiddenFrame\', null,
null, true);}})();";
- resultado.append("new Array(\"EXECUTE\", \"" + strScript + "\")");
+
+ String strConfirmMessage = Utility.messageBD(this,
"BankStatementAccountWarning", vars
+ .getLanguage());
+ if ("Y".equals(strOB3UIMode)) {
+ resultado.append("new Array(\"JSEXECUTE\","
+ + " \"OB.APRM.bankTransitoryAccountCalloutResponse(this, '"
+ + strConfirmMessage.replaceAll("\\\\n", "<br>") + "', '" +
strFinancialAccountId
+ + "')\")");
+ } else {
+ String strScript = "(function(){var confirmation = confirm(\'"
+ + strConfirmMessage.replaceAll("\\\\n", "\\\\\\\\n")
+ + "\'); if(confirmation){submitCommandFormParameter(\'EXECUTE\',
frmMain.inpLastFieldChanged, \'"
+ + strChanged
+ + "\', false, null,
\'../ad_callouts/SE_FinancialAccount_BSAccounts.html\', \'hiddenFrame\', null,
null, true);}})();";
+ resultado.append("new Array(\"EXECUTE\", \"" + strScript + "\")");
+ }
resultado.append(");");
} else {
resultado.append("var
calloutName='SE_FinancialAccount_BSAccounts';\n\n");
@@ -111,11 +115,9 @@
out.close();
}
- private void printPageResponse(HttpServletResponse response,
VariablesSecureApp vars,
- String strWindowId, String strTabId, String strfinTransitoryAcct) throws
IOException,
- ServletException {
- if (log4j.isDebugEnabled())
- log4j.debug("Output: dataSheet");
+ private void printPageResponse(HttpServletResponse response, String
strfinTransitoryAcct)
+ throws IOException, ServletException {
+ log4j.debug("Output: dataSheet");
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
StringBuffer resultado = new StringBuffer();
@@ -137,17 +139,12 @@
out.close();
}
- void updatePaymentMethodConfiguration(String strfinFinancialAccountId,
- String strAccountingSchemaId) {
+ void updatePaymentMethodConfiguration(String strfinFinancialAccountId) {
FIN_FinancialAccount account =
OBDal.getInstance().get(FIN_FinancialAccount.class,
strfinFinancialAccountId);
- OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria(
- FinAccPaymentMethod.class);
- obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, account));
- List<FinAccPaymentMethod> accountPaymentMethods = obc.list();
// Configure clearing account for all payment methods upon clearing event
- for (FinAccPaymentMethod paymentMethod : accountPaymentMethods) {
+ for (FinAccPaymentMethod paymentMethod :
account.getFinancialMgmtFinAccPaymentMethodList()) {
paymentMethod.setOUTUponClearingUse("CLE");
paymentMethod.setINUponClearingUse("CLE");
OBDal.getInstance().save(paymentMethod);
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
