details: https://code.openbravo.com/erp/devel/pi/rev/e3e84290cda6
changeset: 19655:e3e84290cda6
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue Feb 12 13:23:48 2013 +0100
summary: Fixes issue 22715: No error message shown when creating an order
from a sales quotation without payment method defined
diffstat:
src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 11
++++++++-
1 files changed, 9 insertions(+), 2 deletions(-)
diffs (43 lines):
diff -r 4c3694e1e6a9 -r e3e84290cda6
src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java
--- a/src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java
Tue Feb 12 13:02:37 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java
Tue Feb 12 13:23:48 2013 +0100
@@ -38,6 +38,7 @@
import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.dal.core.DalUtil;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
import org.openbravo.erpCommon.businessUtility.Tax;
@@ -261,7 +262,7 @@
+ objCloneOrder.getDocumentNo() + " @beenCreated@");
bundle.setResult(result);
} catch (Exception e) {
- throw new OBException(e);
+ throw new OBException(e.getMessage());
}
}
@@ -453,8 +454,10 @@
/**
* Create new Payment Plan for an Order
+ *
+ * @throws Exception
*/
- private FIN_PaymentSchedule generatePaymentPlan(Order order) {
+ private FIN_PaymentSchedule generatePaymentPlan(Order order) throws
Exception {
FIN_PaymentSchedule ps =
OBProvider.getInstance().get(FIN_PaymentSchedule.class);
ps.setClient(order.getClient());
ps.setOrganization(order.getOrganization());
@@ -465,6 +468,10 @@
ps.setInvoice(null);
ps.setOrder(order);
ps.setCurrency(order.getCurrency());
+ if (order.getPaymentMethod() == null) {
+ throw new Exception(OBMessageUtils.messageBD(new DalConnectionProvider(),
+ "APRM_PAYMENTMETHOD_MISSING",
OBContext.getOBContext().getLanguage().getLanguage()));
+ }
ps.setFinPaymentmethod(order.getPaymentMethod());
ps.setAmount(order.getGrandTotalAmount());
ps.setDueDate(order.getOrderDate());
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
