details: http://code.openbravo.com/erp/devel/pi/rev/8c096e39e46f changeset: 3926:8c096e39e46f user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed May 27 09:41:31 2009 +0200 summary: Fixes bug 0009198: We have got NullPointerException if we do import reference data.
details: http://code.openbravo.com/erp/devel/pi/rev/779dc6b93f46 changeset: 3927:779dc6b93f46 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed May 27 09:43:06 2009 +0200 summary: merge diffstat: src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java | 5 +- src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java | 5 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 3 +- src/org/openbravo/erpCommon/businessUtility/Buscador.java | 61 ++++++++++++++- src/org/openbravo/erpCommon/utility/ModelSQLGeneration.java | 7 +- 5 files changed, 68 insertions(+), 13 deletions(-) diffs (204 lines): diff -r 0d14cd4d204b -r 779dc6b93f46 src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java --- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Tue May 26 21:26:19 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Wed May 27 09:43:06 2009 +0200 @@ -1417,7 +1417,7 @@ /** * Returns the error. "" if there is no error - * + * * @param conn * @param vars * @param strClient @@ -1475,6 +1475,7 @@ if (myFiles[j].getName().endsWith(".xml")) myTargetFiles.add(myFiles[j]); } + myFiles = new File [myTargetFiles.size()]; myFiles = myTargetFiles.toArray(myFiles); StringBuffer strError = new StringBuffer(""); for (int j = 0; j < myFiles.length; j++) { @@ -1525,7 +1526,7 @@ /** * Returns the modules {...@link FieldProvider} ordered taking into account dependencies - * + * * @param modules * @return */ diff -r 0d14cd4d204b -r 779dc6b93f46 src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java --- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Tue May 26 21:26:19 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Wed May 27 09:43:06 2009 +0200 @@ -1025,7 +1025,7 @@ /** * Returns the error. "" if there is no error - * + * * @param vars * @param strOrganization * @param strClient @@ -1079,6 +1079,7 @@ if (myFiles[j].getName().endsWith(".xml")) myTargetFiles.add(myFiles[j]); } + myFiles = new File [myTargetFiles.size()]; myFiles = myTargetFiles.toArray(myFiles); StringBuffer strError = new StringBuffer(""); for (int j = 0; j < myFiles.length; j++) { @@ -1129,7 +1130,7 @@ /** * Returns the modules {...@link FieldProvider} ordered taking into account dependencies - * + * * @param modules * @return */ diff -r 0d14cd4d204b -r 779dc6b93f46 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java --- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Tue May 26 21:26:19 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java Wed May 27 09:43:06 2009 +0200 @@ -212,6 +212,7 @@ if (myFiles[j].getName().endsWith(".xml")) myTargetFiles.add(myFiles[j]); } + myFiles = new File [myTargetFiles.size()]; myFiles = myTargetFiles.toArray(myFiles); } else { myFiles = new File[] {}; @@ -277,7 +278,7 @@ /** * Returns the modules {...@link FieldProvider} ordered taking into account dependencies - * + * * @param modules * @return */ diff -r 0d14cd4d204b -r 779dc6b93f46 src/org/openbravo/erpCommon/businessUtility/Buscador.java --- a/src/org/openbravo/erpCommon/businessUtility/Buscador.java Tue May 26 21:26:19 2009 +0200 +++ b/src/org/openbravo/erpCommon/businessUtility/Buscador.java Wed May 27 09:43:06 2009 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SL - * All portions are Copyright (C) 2001-2006 Openbravo SL + * All portions are Copyright (C) 2001-2009 Openbravo SL * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -347,6 +347,7 @@ boolean scriptCalendar = false; boolean scriptClock = false; boolean scriptCalculator = false; + boolean scriptTime = false; boolean scriptKeyboard = false; boolean scriptSearch = false; boolean scriptSelect = false; @@ -461,6 +462,33 @@ strHtml.append("</tr>\n"); strHtml.append("</table>\n"); strHtml.append("</td>\n"); + } else if (fields[i].reference.equals("24")) { // time + scriptTime = true; + strHtml.append("<td class=\"TextBox_btn_ContentCell\">\n"); + strHtml + .append("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" summary=\"\" style=\"padding-top: 0px;\">\n"); + strHtml.append("<tr>\n"); + strHtml.append("<td class=\"TextBox_ContentCell\">\n"); + strHtml + .append("<input type=\"text\" class=\"dojoValidateValid TextBox_btn_OneCell_width\" "); + strHtml.append("displayFormat=\"%H:%M:%S\" "); + strHtml.append("saveFormat=\"%H:%M:%S\" "); + strHtml.append("name=\"inpParam").append(FormatUtilities.replace(fields[i].columnname)) + .append("\" "); + strHtml.append("maxlength=\"19\" "); + strHtml.append("value=\"").append(fields[i].value).append("\" "); + strHtml.append("id=\"inpParam").append(FormatUtilities.replace(fields[i].columnname)) + .append("\" "); + + strHtml + .append("onkeyup=\"autoCompleteTime(this);\" onchange=\"validateTimeTextBox(this);logChanges(this);return true;\"></input> "); + strHtml.append("<script>djConfig.searchIds.push(\"").append("inpParam").append( + FormatUtilities.replace(fields[i].columnname)).append("\") </script>"); + strHtml.append("</td>\n"); + strHtml.append("</td>\n"); + strHtml.append("</tr>\n"); + strHtml.append("</table>\n"); + strHtml.append("</td>\n"); } else if (fields[i].reference.equals("20")) { // YesNo strHtml.append("<td class=\"Radio_Check_ContentCell\">\n"); strHtml @@ -742,13 +770,32 @@ strHtml.append("</tr>\n"); strHtml.append("</table>\n"); strHtml.append("</td>\n"); - } else { - strHtml.append("<input type=\"text\" "); + } else { // time + strHtml.append("<td class=\"TextBox_btn_ContentCell\">\n"); + strHtml + .append("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" summary=\"\" style=\"padding-top: 0px;\">\n"); + strHtml.append("<tr>\n"); + strHtml.append("<td class=\"TextBox_ContentCell\">\n"); + strHtml + .append("<input type=\"text\" class=\"dojoValidateValid TextBox_btn_OneCell_width\" "); + strHtml.append("displayFormat=\"%H:%M:%S\" "); + strHtml.append("saveFormat=\"%H:%M:%S\" "); strHtml.append("name=\"inpParam").append(FormatUtilities.replace(fields[i].columnname)) .append("_f\" "); - strHtml.append(fields[i].fieldlength).append("\" "); + strHtml.append("maxlength=\"19\" "); strHtml.append("value=\"").append(value).append("\" "); - strHtml.append(">"); + strHtml.append("id=\"inpParam").append(FormatUtilities.replace(fields[i].columnname)) + .append("_f\" "); + + strHtml + .append("onkeyup=\"autoCompleteTime(this);\" onchange=\"validateTimeTextBox(this);logChanges(this);return true;\"></input> "); + strHtml.append("<script>djConfig.searchIds.push(\"").append("inpParam").append( + FormatUtilities.replace(fields[i].columnname)).append("\") </script>"); + strHtml.append("</td>\n"); + strHtml.append("</td>\n"); + strHtml.append("</tr>\n"); + strHtml.append("</table>\n"); + strHtml.append("</td>\n"); } // strHtml.append("</td></tr></table>\n"); } @@ -799,6 +846,10 @@ scrScr.append("<script language=\"JavaScript\" src=\"").append(strReplaceWith).append( "/js/searchs.js\" type=\"text/javascript\"></script>"); } + if (scriptTime) { + scrScr.append("<script language=\"JavaScript\" src=\"").append(strReplaceWith).append( + "/js/default/TimeTextBox.js\" type=\"text/javascript\"></script>"); + } if (scriptSelect) { } vecScript.addElement(scrScr); diff -r 0d14cd4d204b -r 779dc6b93f46 src/org/openbravo/erpCommon/utility/ModelSQLGeneration.java --- a/src/org/openbravo/erpCommon/utility/ModelSQLGeneration.java Tue May 26 21:26:19 2009 +0200 +++ b/src/org/openbravo/erpCommon/utility/ModelSQLGeneration.java Wed May 27 09:43:06 2009 +0200 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SL - * All portions are Copyright (C) 2001-2006 Openbravo SL + * All portions are Copyright (C) 2001-2009 Openbravo SL * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -213,8 +213,9 @@ return ""; StringBuffer text = new StringBuffer(); if (reference.equals("15") || reference.equals("16") || reference.equals("24")) { - text.append("TO_DATE(").append(tablename).append(".").append(columnname).append( - (reference.equals("24") ? ", 'HH24:MI:SS'" : "")).append(") "); + text.append("TO_DATE(").append(reference.equals("24") ? "TO_CHAR(" : "").append(tablename) + .append(".").append(columnname).append( + (reference.equals("24") ? ", 'HH24:MI:SS'), 'HH24:MI:SS'" : "")).append(") "); if (first) text.append(">= "); else { ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp as they present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
