details: https://code.openbravo.com/erp/stable/2.50/rev/5c6974c686d5 changeset: 9595:5c6974c686d5 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jul 22 10:39:32 2011 +0200 summary: Fixes issue 17938: The error message is not clear
details: https://code.openbravo.com/erp/stable/2.50/rev/443cc0cba6da changeset: 9596:443cc0cba6da user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Jul 26 16:50:19 2011 +0200 summary: Fixes issue 15262: Copy lines button incorrect message diffstat: src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java | 12 ++- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 37 +++++---- src/org/openbravo/erpCommon/ad_forms/Fact.java | 1 + 3 files changed, 31 insertions(+), 19 deletions(-) diffs (91 lines): diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java Thu Jul 28 12:39:21 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java Tue Jul 26 16:50:19 2011 +0200 @@ -32,10 +32,12 @@ import org.openbravo.base.filter.IsPositiveIntFilter; import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.dal.core.OBContext; import org.openbravo.erpCommon.utility.DateTimeData; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.SequenceIdData; import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.service.db.DalConnectionProvider; import org.openbravo.utils.Replace; import org.openbravo.xmlEngine.XmlDocument; @@ -62,8 +64,14 @@ printPageDataSheet(response, vars, strKey, strWindowId, strTabId, strSOTrx, strBpartner, strmPricelistId); } else if (vars.commandIn("SAVE")) { - String strRownum = vars.getRequiredInStringParameter("inpRownumId", - IsPositiveIntFilter.instance); + String strRownum = null; + try { + strRownum = vars.getRequiredInStringParameter("inpRownumId", IsPositiveIntFilter.instance); + } catch (ServletException e) { + log4j.error("Error captured: ", e); + throw new ServletException(Utility.messageBD(new DalConnectionProvider(), "@JS1@", + OBContext.getOBContext().getLanguage().getLanguage())); + } String strKey = vars.getRequiredStringParameter("inpcOrderId"); String strWindowId = vars.getStringParameter("inpWindowId"); String strSOTrx = vars.getStringParameter("inpissotrx"); diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_forms/DocInOut.java --- a/src/org/openbravo/erpCommon/ad_forms/DocInOut.java Thu Jul 28 12:39:21 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocInOut.java Tue Jul 26 16:50:19 2011 +0200 @@ -223,23 +223,26 @@ dr = fact.createLine(line, line.getAccount(ProductInfo.ACCTTYPE_P_Asset, as, conn), as .getC_Currency_ID(), strCosts, "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); - dr.setM_Locator_ID(line.m_M_Locator_ID); - dr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from - // Loc - dr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to - // Loc - log4jDocInOut.debug("(matReceipt) - CR account: " - + line.getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn)); - log4jDocInOut.debug("(matReceipt) - CR costs: " + strCosts); - // NotInvoicedReceipt CR - cr = fact.createLine(line, getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn), - as.getC_Currency_ID(), "", strCosts, Fact_Acct_Group_ID, nextSeqNo(SeqNo), - DocumentType, conn); - cr.setM_Locator_ID(line.m_M_Locator_ID); - cr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from - // Loc - cr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to - // Loc + if (!getStatus().equals("i")) { + dr.setM_Locator_ID(line.m_M_Locator_ID); + dr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from + // Loc + dr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to + // Loc + log4jDocInOut.debug("(matReceipt) - CR account: " + + line.getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn)); + log4jDocInOut.debug("(matReceipt) - CR costs: " + strCosts); + // NotInvoicedReceipt CR + cr = fact.createLine(line, + getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn), + as.getC_Currency_ID(), "", strCosts, Fact_Acct_Group_ID, nextSeqNo(SeqNo), + DocumentType, conn); + cr.setM_Locator_ID(line.m_M_Locator_ID); + cr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from + // Loc + cr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to + // Loc + } } } } else { diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_forms/Fact.java --- a/src/org/openbravo/erpCommon/ad_forms/Fact.java Thu Jul 28 12:39:21 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/Fact.java Tue Jul 26 16:50:19 2011 +0200 @@ -125,6 +125,7 @@ // Data Check if (account == null) { log4jFact.debug("end of create line"); + m_doc.setStatus(AcctServer.STATUS_InvalidAccount); return null; } // ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
