details: https://code.openbravo.com/erp/devel/pi/rev/4a9073e3b4a9
changeset: 24084:4a9073e3b4a9
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
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java
| 8 ++------
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 +++++++
7 files changed, 44 insertions(+), 6 deletions(-)
diffs (199 lines):
diff -r c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java
Fri Jul 18 12:49:36 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;
@@ -33,7 +32,6 @@
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;
@@ -70,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 {
@@ -160,10 +160,6 @@
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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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 c0d0ff12a14b -r 4a9073e3b4a9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java
Mon Jul 21 08:40:58 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java
Fri Jul 18 12:49:36 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());
+ }
+
}
------------------------------------------------------------------------------
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
