details: https://code.openbravo.com/erp/devel/pi/rev/93a3e094851a changeset: 24075:93a3e094851a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Jul 17 18:38:00 2014 +0200 summary: Fixed bug 27119: Wrong default value in deposit to combo
details: https://code.openbravo.com/erp/devel/pi/rev/2b39480d9c7a changeset: 24076:2b39480d9c7a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Jul 18 12:22:56 2014 +0200 summary: Fixed bug 27127 Addpayment button should be in the same position in on all windows details: https://code.openbravo.com/erp/devel/pi/rev/8994a8efdb5e changeset: 24077:8994a8efdb5e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Jul 18 12:28:40 2014 +0200 summary: Fixed bug 27128 focus should be in actual payment (sales flow) diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 25 ++++++++- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 7 ++- 3 files changed, 28 insertions(+), 8 deletions(-) diffs (87 lines): diff -r fb05bf3da92e -r 8994a8efdb5e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Jul 17 18:30:20 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Jul 18 12:28:40 2014 +0200 @@ -349,7 +349,7 @@ <!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> <!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--04CFE3A53162449380A253DE0B814AEF--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--04CFE3A53162449380A253DE0B814AEF--> <SEQNO><![CDATA[540]]></SEQNO> +<!--04CFE3A53162449380A253DE0B814AEF--> <SEQNO><![CDATA[335]]></SEQNO> <!--04CFE3A53162449380A253DE0B814AEF--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--04CFE3A53162449380A253DE0B814AEF--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--04CFE3A53162449380A253DE0B814AEF--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -20496,7 +20496,7 @@ <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <SEQNO><![CDATA[530]]></SEQNO> +<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <SEQNO><![CDATA[415]]></SEQNO> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r fb05bf3da92e -r 8994a8efdb5e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java Thu Jul 17 18:30:20 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java Fri Jul 18 12:28:40 2014 +0200 @@ -30,6 +30,8 @@ import org.codehaus.jettison.json.JSONObject; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.security.OrganizationStructureProvider; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.common.businesspartner.BusinessPartner; @@ -134,10 +136,25 @@ BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class, strBPartnerId); boolean isSOTrx = "Y".equals(getDefaultIsSOTrx(requestMap)); - if (isSOTrx && businessPartner.getAccount() != null) { - return businessPartner.getAccount().getId(); - } else if (!isSOTrx && businessPartner.getPOFinancialAccount() != null) { - return businessPartner.getPOFinancialAccount().getId(); + if (context.has("inpadClientId") && context.has("inpadOrgId")) { + final OrganizationStructureProvider osp = OBContext.getOBContext() + .getOrganizationStructureProvider(context.getString("inpadClientId")); + if (isSOTrx && businessPartner.getAccount() != null) { + if (osp.isInNaturalTree(businessPartner.getAccount().getOrganization(), OBDal + .getInstance().get(Organization.class, context.getString("inpadOrgId")))) { + return businessPartner.getAccount().getId(); + } else { + return ""; + } + + } else if (!isSOTrx && businessPartner.getPOFinancialAccount() != null) { + if (osp.isInNaturalTree(businessPartner.getPOFinancialAccount().getOrganization(), OBDal + .getInstance().get(Organization.class, context.getString("inpadOrgId")))) { + return businessPartner.getPOFinancialAccount().getId(); + } else { + return ""; + } + } } } return null; diff -r fb05bf3da92e -r 8994a8efdb5e modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Thu Jul 17 18:30:20 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Fri Jul 18 12:28:40 2014 +0200 @@ -97,8 +97,8 @@ glitemGrid = form.getItem('glitem').canvas.viewGrid, creditUseGrid = form.getItem('credit_to_use').canvas.viewGrid, overpaymentAction = form.getItem('overpayment_action'), - payment = form.getItem('fin_payment_id').getValue(); - + payment = form.getItem('fin_payment_id').getValue(), + issotrx = form.getItem('issotrx').getValue(); OB.APRM.AddPayment.paymentMethodMulticurrency(view, view.theForm, !payment); glitemGrid.fetchData(); creditUseGrid.fetchData(); @@ -111,6 +111,9 @@ form.isCreditAllowed = form.getItem('received_from').getValue() !== undefined; OB.APRM.AddPayment.checkSingleActionAvailable(form); overpaymentAction.originalValueMap = isc.addProperties({}, overpaymentAction.getValueMap()); + if (issotrx) { + form.focusInItem(form.getItem('actual_payment')); + } }; OB.APRM.AddPayment.addNewGLItem = function (grid) { ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
