details: https://code.openbravo.com/erp/devel/pi/rev/67a6d258fb63 changeset: 19195:67a6d258fb63 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 10 20:13:59 2013 +0100 summary: CI: update AD_MODULE to version 19191
details: https://code.openbravo.com/erp/devel/pi/rev/6643d4586bf2 changeset: 19196:6643d4586bf2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 10 20:30:34 2013 +0100 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 29 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 51 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 24 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 30 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 48 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 39 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 41 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 46 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 74 +- src-db/database/model/functions/C_INVOICE_POST.xml | 19 +- src-db/database/model/functions/C_ORDER_POST1.xml | 19 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 51 +- src-db/database/model/functions/M_INOUT_POST.xml | 16 + src-db/database/model/functions/M_REQUISITION_POST.xml | 40 +- src-db/database/model/tables/C_BPARTNER.xml | 51 + src-db/database/sourcedata/AD_COLUMN.xml | 360 ++++++++++ src-db/database/sourcedata/AD_ELEMENT.xml | 140 +++ src-db/database/sourcedata/AD_FIELD.xml | 312 ++++++++- src-db/database/sourcedata/AD_FIELDGROUP.xml | 9 + src-db/database/sourcedata/AD_MESSAGE.xml | 66 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src/org/openbravo/dal/xml/EntityResolver.java | 34 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 30 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 33 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java | 8 + src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 36 +- src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_PriceList.java | 8 + src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 14 + src/org/openbravo/service/rest/DalWebService.java | 2 + 70 files changed, 1675 insertions(+), 150 deletions(-) diffs (truncated from 3364 to 300 lines): diff -r d67e4d8ad581 -r 6643d4586bf2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 10 20:30:34 2013 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19180]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19191]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r d67e4d8ad581 -r 6643d4586bf2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 10 20:30:34 2013 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19180]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19191]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19180]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19191]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Thu Jan 10 20:30:34 2013 +0100 @@ -133,6 +133,33 @@ return true; } +function bPartnerBlocked(){ + try { + var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html"; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackBPartnerBlocked, document.frmMain, "BPARTNERBLOCK", url, false, null, paramXMLReq); + } catch (e) { + alert(e); + } +} + +function callBackBPartnerBlocked(paramXMLParticular, XMLHttpRequestObj) { + if (getReadyStateHandler(XMLHttpRequestObj)) { + try { + if (XMLHttpRequestObj.responseText) { + strText = XMLHttpRequestObj.responseText; + var objson = eval(strText); + showJSMessage(objson.text); + return false; + } else { + openProcessPayment(); + return true; + } + } catch (e) {} + } + return true; +} + function callBackGrid(paramXMLParticular, XMLHttpRequestObj) { var strText = ''; if (getReadyStateHandler(XMLHttpRequestObj)) { @@ -1696,7 +1723,7 @@ <button type="button" id="buttonProcess" class="ButtonLink" - onclick="openProcessPayment();return false;" + onclick="bPartnerBlocked(this);return false;" onfocus="buttonEvent('onfocus', this); window.status='Create'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Thu Jan 10 20:30:34 2013 +0100 @@ -112,6 +112,42 @@ printGrid(response, vars, strBusinessPartnerId, strPaymentId, strOrgId, strExpectedDateFrom, strExpectedDateTo, strDocumentType, strSelectedPaymentDetails, isReceipt, showAlternativePM); + } else if (vars.commandIn("BPARTNERBLOCK")) { + boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); + String strBusinessPartnerId = vars.getRequestGlobalVariable("inpBusinessPartnerId", ""); + if ("".equals(strBusinessPartnerId)) { + strBusinessPartnerId = vars.getRequestGlobalVariable("inpcBPartnerId", ""); + } + if (!"".equals(strBusinessPartnerId)) { + BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class, + strBusinessPartnerId); + if (FIN_Utility.isBlockedBusinessPartner(businessPartner.getId(), isReceipt, 4)) { + businessPartnerBlocked(response, vars, businessPartner.getIdentifier()); + } + } else { + String strSelectedScheduledPaymentDetailIds = vars.getInStringParameter( + "inpScheduledPaymentDetailId", "", null); + if (!"".equals(strSelectedScheduledPaymentDetailIds)) { + OBContext.setAdminMode(true); + try { + List<FIN_PaymentScheduleDetail> selectedPaymentDetails = FIN_Utility.getOBObjectList( + FIN_PaymentScheduleDetail.class, strSelectedScheduledPaymentDetailIds); + for (FIN_PaymentScheduleDetail psd : selectedPaymentDetails) { + BusinessPartner bPartner; + if (psd.getInvoicePaymentSchedule() == null) { + bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner(); + } else { + bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner(); + } + if (FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), isReceipt, 4)) { + businessPartnerBlocked(response, vars, bPartner.getIdentifier()); + } + } + } finally { + OBContext.restorePreviousMode(); + } + } + } } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) { boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); String strAction = null; @@ -887,6 +923,21 @@ return storedNotSelectedPSDs; } + private void businessPartnerBlocked(HttpServletResponse response, VariablesSecureApp vars, + String strBPartnerName) throws IOException, ServletException { + + try { + JSONObject json = new JSONObject(); + json.put("text", "SelectedBPartnerBlocked"); + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + out.println("objson = " + json); + out.close(); + } catch (JSONException e) { + log4j.error(e); + } + } + public String getServletInfo() { return "Servlet that presents the payment proposal"; // end of getServletInfo() method diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html Thu Jan 10 20:30:34 2013 +0100 @@ -273,6 +273,33 @@ return true; } +function bPartnerBlocked(){ + try { + var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromInvoice.html"; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackBPartnerBlocked, document.frmMain, "BPARTNERBLOCK", url, false, null, paramXMLReq); + } catch (e) { + alert(e); + } +} + +function callBackBPartnerBlocked(paramXMLParticular, XMLHttpRequestObj) { + if (getReadyStateHandler(XMLHttpRequestObj)) { + try { + if (XMLHttpRequestObj.responseText) { + strText = XMLHttpRequestObj.responseText; + var objson = eval(strText); + showJSMessage(objson.text); + return false; + } else { + openProcessPayment(); + return true; + } + } catch (e) {} + } + return true; +} + function useCreditOnChange(){ actualPaymentOnChange(); updateTotal(); @@ -467,9 +494,9 @@ if (getReadyStateHandler(XMLHttpRequestObj)) { try { if (XMLHttpRequestObj.responseText) { - strText = XMLHttpRequestObj.responseText; + strText = XMLHttpRequestObj.responseText; createCombo(document.getElementById('paramActionDocument'), strText); - document.getElementById('client_top_popup').style.display = 'block'; + document.getElementById('client_top_popup').style.display = 'block'; document.getElementById('client_top').style.display = 'none'; document.getElementById('client_middle').style.display = 'none'; document.getElementById('client_bottom').style.display = 'none'; @@ -1235,7 +1262,7 @@ <button type="button" id="buttonProcess" class="ButtonLink" - onclick="openProcessPayment();return false;" + onclick="bPartnerBlocked(this);return false;" onfocus="buttonEvent('onfocus', this); window.status='Create'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Thu Jan 10 20:30:34 2013 +0100 @@ -151,6 +151,14 @@ refreshExchangeRate(response, vars, strCurrencyId, strFinancialAccountCurrencyId, strPaymentDate, org, conversionRatePrecision); + } else if (vars.commandIn("BPARTNERBLOCK")) { + boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); + String strReceivedFromId = vars.getRequiredStringParameter("inpBusinessPartnerId"); + BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class, + strReceivedFromId); + if (FIN_Utility.isBlockedBusinessPartner(businessPartner.getId(), isReceipt, 4)) { + businessPartnerBlocked(response, vars, businessPartner.getIdentifier()); + } } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) { boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); String strAction = null; @@ -730,4 +738,20 @@ } return false; } + + private void businessPartnerBlocked(HttpServletResponse response, VariablesSecureApp vars, + String strBPartnerName) throws IOException, ServletException { + + try { + JSONObject json = new JSONObject(); + json.put("text", "SelectedBPartnerBlocked"); + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + out.println("objson = " + json); + out.close(); + } catch (JSONException e) { + log4j.error(e); + } + + } } diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Thu Jan 10 20:30:34 2013 +0100 @@ -132,6 +132,34 @@ } } } + +function bPartnerBlocked(){ + try { + var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromTransaction.html"; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackBPartnerBlocked, document.frmMain, "BPARTNERBLOCK", url, false, null, paramXMLReq); + } catch (e) { + alert(e); + } +} + +function callBackBPartnerBlocked(paramXMLParticular, XMLHttpRequestObj) { + if (getReadyStateHandler(XMLHttpRequestObj)) { + try { + if (XMLHttpRequestObj.responseText) { + strText = XMLHttpRequestObj.responseText; + var objson = eval(strText); + showJSMessage(objson.text); + return false; + } else { + openProcessPayment(); + return true; + } + } catch (e) {} + } + return true; +} + function callBackPaymentMethod(paramXMLParticular, XMLHttpRequestObj) { var strText = ""; if (getReadyStateHandler(XMLHttpRequestObj)) { @@ -1996,7 +2024,7 @@ <button type="button" id="buttonProcess" class="ButtonLink" - onclick="openProcessPayment();return false;" + onclick="bPartnerBlocked(this);return false;" onfocus="buttonEvent('onfocus', this); window.status='Create'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r d67e4d8ad581 -r 6643d4586bf2 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 Wed Jan 09 09:37:30 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Thu Jan 10 20:30:34 2013 +0100 @@ -168,6 +168,39 @@ exchangeRateFormat = vars.getSessionValue("#FormatOutput|generalQtyRelation", "#,##0.######"); refreshExchangeRate(response, strCurrencyId, strFinancialAccountCurrencyId, strPaymentDate, fa.getOrganization(), conversionRatePrecision); + } else if (vars.commandIn("BPARTNERBLOCK")) { + boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_122712 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
