details: https://code.openbravo.com/erp/devel/main/rev/3beaa3567d5f changeset: 23971:3beaa3567d5f user: Miguel A. Alsasua <miguel.alsasua <at> openbravo.com> date: Wed Jul 02 09:31:21 2014 +0200 summary: updated copyright
details: https://code.openbravo.com/erp/devel/main/rev/c72ba2ba542e changeset: 23972:c72ba2ba542e user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Jul 03 15:12:47 2014 +0200 summary: Fixed issue 26990: Now 'Field Access' rules based on 'Role' work again details: https://code.openbravo.com/erp/devel/main/rev/af3384088da6 changeset: 23973:af3384088da6 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jul 02 11:24:49 2014 +0200 summary: Fixes bug 26995 oustandingAmount is wrong calculated in done validation details: https://code.openbravo.com/erp/devel/main/rev/dda8644b37a3 changeset: 23974:dda8644b37a3 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Jul 08 17:17:38 2014 +0530 summary: Fixes Issue 27005: Wrong behaviour when filtering the a formitem that uses the table reference Do not consider the current value when filtering records using combos. details: https://code.openbravo.com/erp/devel/main/rev/6f1c374c25b8 changeset: 23975:6f1c374c25b8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jul 04 08:11:23 2014 +0200 summary: fixed bug 27009: mandatory grid params make P&E popup to fail details: https://code.openbravo.com/erp/devel/main/rev/ed20c85ab5c0 changeset: 23976:ed20c85ab5c0 user: Daniel Ruiz <daniel.ruiz <at> openbravo.com> date: Wed Jul 09 18:22:22 2014 +0200 summary: Fixes Issue 27018: Traceability report is broken details: https://code.openbravo.com/erp/devel/main/rev/0d4bd4e76b8e changeset: 23977:0d4bd4e76b8e user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Jul 10 17:38:04 2014 +0200 summary: Fixes issue 27045: The focus get stuck in date parameters after being updated The problem was that if the form was redrawn in the handleItemChange function just after updating a date parameter, the redraw resulted in the date parameter being focused again. This is fixed by invoking markForRedraw instead of redraw for these parameters. details: https://code.openbravo.com/erp/devel/main/rev/657594721802 changeset: 23978:657594721802 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 14 09:17:23 2014 +0200 summary: fixed bug 27057: can't select value in drop down if role has no access to field entity Entity access check is done in admin mode, other case it failed if current role had no access to field/column entities details: https://code.openbravo.com/erp/devel/main/rev/d995197101cb changeset: 23979:d995197101cb user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Jul 14 16:23:48 2014 +0530 summary: Fixes Issue 27061: Sales Representative field is not initialized properly In the combos project, the FIC always returned one value when opening/editing a record. To achieve this, whenever columnValue was present it was used. But there are cases where columnValue is the session value. So setting the first element only if it matches with the columnValue now. Or else removing the value as it is not needed. When the dropdown is clicked, data is fetched from ComboTableDatasourceService, so it is not affected with this change. details: https://code.openbravo.com/erp/devel/main/rev/9812b254f6a9 changeset: 23980:9812b254f6a9 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 14 09:18:03 2014 +0200 summary: related to bug 27057: added test to cover this case details: https://code.openbravo.com/erp/devel/main/rev/0994ef60bf8c changeset: 23981:0994ef60bf8c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 07 09:59:09 2014 +0200 summary: fixed bug 27022: Sequential scans in ad_preference table details: https://code.openbravo.com/erp/devel/main/rev/0d33bb96c147 changeset: 23982:0d33bb96c147 user: Rafa Roda Palacios <rafa.roda <at> ubiquads.com> date: Wed Jul 16 19:40:47 2014 +0200 summary: Fixes issue 26701 Rebuild of Payment Report for improving performance details: https://code.openbravo.com/erp/devel/main/rev/d7c19111c4f8 changeset: 23983:d7c19111c4f8 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Jul 16 21:28:59 2014 +0530 summary: Fixes Issue 27095:Create Invoice from Orders does not work for After Delivery Invoice Terms orders details: https://code.openbravo.com/erp/devel/main/rev/068ce411734f changeset: 23984:068ce411734f user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Jul 21 10:18:17 2014 +0530 summary: Fixes Issue 27008: "Recent Documents" is not working under some circumstances The full view is prepared if the record is navigated directly as the target tab may be part of any parent tab. details: https://code.openbravo.com/erp/devel/main/rev/f2e505b2c964 changeset: 23985:f2e505b2c964 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Jul 18 12:49:36 2014 +0200 summary: Fixes issue 27064: Default Value for Payment Date in Add Details popup in Payment In/Out is incorrect details: https://code.openbravo.com/erp/devel/main/rev/8c5e2f247bdf changeset: 23986:8c5e2f247bdf 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/main/rev/ec3d60bf2df4 changeset: 23987:ec3d60bf2df4 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/main/rev/e333e7769631 changeset: 23988:e333e7769631 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) details: https://code.openbravo.com/erp/devel/main/rev/3b8b149a0a22 changeset: 23989:3b8b149a0a22 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jul 22 12:30:06 2014 +0200 summary: Fixes Issue 27149: Error message not displayed details: https://code.openbravo.com/erp/devel/main/rev/f0b7707ee44d changeset: 23990:f0b7707ee44d user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Jul 16 17:53:44 2014 +0200 summary: Fixed issue 27101.Add missing indexes. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java | 7 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 8 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 32 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 17 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 399 +++++---- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java | 12 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 2 +- src-db/database/model/tables/AD_PREFERENCE.xml | 6 + src-db/database/model/tables/M_RESERVATION.xml | 9 + src-db/database/model/tables/M_RESERVATION_STOCK.xml | 6 + src-test/org/openbravo/test/datasource/TestComboDatasource.java | 19 + src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.xml | 2 +- src/org/openbravo/event/BusinessPartnerEventHandler.java | 2 +- 26 files changed, 396 insertions(+), 234 deletions(-) diffs (truncated from 1343 to 300 lines): diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Jul 16 17:53:44 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 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Wed Jul 16 17:53:44 2014 +0200 @@ -154,7 +154,7 @@ errorMessage.put("severity", "error"); errorMessage.put("text", e.getMessage()); jsonResponse.put("message", errorMessage); - return errorMessage; + return jsonResponse; } } payment.setAmount(new BigDecimal(strActualPayment)); diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java Wed Jul 16 17:53:44 2014 +0200 @@ -19,7 +19,6 @@ package org.openbravo.advpaymentmngt.filterexpression; import java.math.BigDecimal; -import java.util.Date; import java.util.List; import java.util.Map; @@ -30,8 +29,9 @@ 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; import org.openbravo.model.common.enterprise.Organization; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; @@ -68,6 +68,8 @@ abstract String getOrganization(Map<String, String> requestMap) throws JSONException; + abstract String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException; + protected abstract long getSeq(); String getDefaultCurrencyTo(Map<String, String> requestMap) throws JSONException { @@ -134,19 +136,30 @@ 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; } - String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { - return OBDateUtils.formatDate(new Date()); - } - String getDefaultPaymentMethod(Map<String, String> requestMap) throws JSONException { JSONObject context = new JSONObject(requestMap.get("context")); if (context.has("inpfinPaymentmethodId") diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -26,6 +26,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.financialmgmt.payment.FIN_Payment; @ComponentProvider.Qualifier(APRMConstants.PAYMENT_IN_WINDOW_ID) @@ -143,4 +144,10 @@ return getPayment(requestMap).getOrganization().getId(); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + // Payment Date of the current payment + return OBDateUtils.formatDate(getPayment(requestMap).getPaymentDate()); + } + } diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -26,6 +26,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.financialmgmt.payment.FIN_Payment; @ComponentProvider.Qualifier(APRMConstants.PAYMENT_OUT_WINDOW_ID) @@ -154,4 +155,10 @@ return getPayment(requestMap).getOrganization().getId(); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + // Payment Date of the current payment + return OBDateUtils.formatDate(getPayment(requestMap).getPaymentDate()); + } + } diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -19,6 +19,7 @@ package org.openbravo.advpaymentmngt.filterexpression; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; import org.codehaus.jettison.json.JSONException; @@ -26,6 +27,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.common.invoice.Invoice; @ComponentProvider.Qualifier(APRMConstants.PURCHASE_INVOICE_WINDOW_ID) @@ -127,4 +129,9 @@ return OBDal.getInstance().get(Invoice.class, context.getString("inpcInvoiceId")); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + return OBDateUtils.formatDate(new Date()); + } + } diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -19,6 +19,7 @@ package org.openbravo.advpaymentmngt.filterexpression; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; import org.codehaus.jettison.json.JSONException; @@ -26,6 +27,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.common.order.Order; @ComponentProvider.Qualifier(APRMConstants.PURCHASE_ORDER_WINDOW_ID) @@ -131,4 +133,9 @@ return OBDal.getInstance().get(Order.class, context.getString("inpcOrderId")); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + return OBDateUtils.formatDate(new Date()); + } + } diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -19,6 +19,7 @@ package org.openbravo.advpaymentmngt.filterexpression; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; import org.codehaus.jettison.json.JSONException; @@ -26,6 +27,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.common.invoice.Invoice; @ComponentProvider.Qualifier(APRMConstants.SALES_INVOICE_WINDOW_ID) @@ -127,4 +129,9 @@ return OBDal.getInstance().get(Invoice.class, context.getString("inpcInvoiceId")); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + return OBDateUtils.formatDate(new Date()); + } + } diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java Wed Jul 16 17:53:44 2014 +0200 @@ -19,6 +19,7 @@ package org.openbravo.advpaymentmngt.filterexpression; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; import org.codehaus.jettison.json.JSONException; @@ -26,6 +27,7 @@ import org.openbravo.advpaymentmngt.utility.APRMConstants; import org.openbravo.client.kernel.ComponentProvider; import org.openbravo.dal.service.OBDal; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.model.common.order.Order; @ComponentProvider.Qualifier(APRMConstants.SALES_ORDER_WINDOW_ID) @@ -131,4 +133,9 @@ return OBDal.getInstance().get(Order.class, context.getString("inpcOrderId")); } + @Override + String getDefaultPaymentDate(Map<String, String> requestMap) throws JSONException { + return OBDateUtils.formatDate(new Date()); + } + } diff -r 77b6251af841 -r f0b7707ee44d 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 Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Wed Jul 16 17:53:44 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) { @@ -747,7 +750,7 @@ // Check if there is pending amount to distribute that could be distributed for (i = 0; i < selectedRecords.length; i++) { - outstandingAmount = new BigDecimal(String(orderInvoiceGrid.getRecord(i).outstandingAmount)); + outstandingAmount = new BigDecimal(String(selectedRecords[i].outstandingAmount)); totalOustandingAmount = totalOustandingAmount.add(outstandingAmount); } for (i = 0; i < orderInvoiceGrid.data.totalRows; i++) { diff -r 77b6251af841 -r f0b7707ee44d modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java Fri Jul 18 09:47:52 2014 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java Wed Jul 16 17:53:44 2014 +0200 @@ -238,7 +238,8 @@ ------------------------------------------------------------------------------ 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
