details: /erp/devel/int/rev/910d90095076
changeset: 6486:910d90095076
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Feb 24 18:56:14 2010 +0100
summary: Fixed issue 12462. Errors which happened in a task which doesn't use
log4j will now always be shown both in the rebuild window and in the log file.
details: /erp/devel/int/rev/6a6147f9d298
changeset: 6487:6a6147f9d298
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Feb 25 12:29:24 2010 +0530
summary: Fixes Issue 12097: A calendar doesn't disappear on Explorer.
details: /erp/devel/int/rev/46657e4bb4ad
changeset: 6488:46657e4bb4ad
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Thu Feb 25 13:33:59 2010 +0530
summary: Fixes Issue 12246: Uncorrect name in bank.dat
details: /erp/devel/int/rev/93dda800a37d
changeset: 6489:93dda800a37d
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Feb 25 11:04:05 2010 +0100
summary: Fixes issue 12438: Uncorrect FK in Fact_acct
details: /erp/devel/int/rev/314b084f21b9
changeset: 6490:314b084f21b9
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 11:42:46 2010 +0100
summary: Fixed issue 12464: Back button now works again
diffstat:
src-db/database/model/tables/C_BUDGETLINE.xml | 6 -
src-db/database/model/tables/C_VALIDCOMBINATION.xml | 6 -
src-db/database/model/tables/FACT_ACCT.xml | 6 -
src-db/database/model/tables/I_GLJOURNAL.xml | 6 -
src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql | 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFile_data.xsql | 6 +-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html | 2 +-
src/org/openbravo/erpCommon/ad_process/ApplyModules.html | 3 +-
src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java | 69
++++++++-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
src/org/openbravo/erpCommon/utility/AntExecutor.java | 4 +-
web/js/utils.js | 6 +-
12 files changed, 79 insertions(+), 41 deletions(-)
diffs (truncated from 326 to 300 lines):
diff -r 8925b5958741 -r 314b084f21b9
src-db/database/model/tables/C_BUDGETLINE.xml
--- a/src-db/database/model/tables/C_BUDGETLINE.xml Wed Feb 24 19:00:37
2010 +0100
+++ b/src-db/database/model/tables/C_BUDGETLINE.xml Thu Feb 25 11:42:46
2010 +0100
@@ -148,12 +148,6 @@
<foreign-key foreignTable="C_PERIOD" name="C_BUDGETLINE_C_PERIOD">
<reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="C_BUDGETLINE_USER1">
- <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="C_BUDGETLINE_USER2">
- <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
<foreign-key foreignTable="C_BPARTNER" name="C_BUSPARTNER_C_BUDGETLINE">
<reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
</foreign-key>
diff -r 8925b5958741 -r 314b084f21b9
src-db/database/model/tables/C_VALIDCOMBINATION.xml
--- a/src-db/database/model/tables/C_VALIDCOMBINATION.xml Wed Feb 24
19:00:37 2010 +0100
+++ b/src-db/database/model/tables/C_VALIDCOMBINATION.xml Thu Feb 25
11:42:46 2010 +0100
@@ -140,12 +140,6 @@
<foreign-key foreignTable="M_PRODUCT"
name="C_VALIDCOMBINATION_M_PRODUCT">
<reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE"
name="C_VALIDCOMBINATION_USER1">
- <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE"
name="C_VALIDCOMBINATION_USER2">
- <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
<index name="C_VALIDCOMBINATION_ALIAS" unique="false">
<index-column name="AD_CLIENT_ID"/>
<index-column name="ALIAS"/>
diff -r 8925b5958741 -r 314b084f21b9 src-db/database/model/tables/FACT_ACCT.xml
--- a/src-db/database/model/tables/FACT_ACCT.xml Wed Feb 24 19:00:37
2010 +0100
+++ b/src-db/database/model/tables/FACT_ACCT.xml Thu Feb 25 11:42:46
2010 +0100
@@ -263,12 +263,6 @@
<foreign-key foreignTable="M_LOCATOR" name="FACT_ACCT_M_LOCATOR">
<reference local="M_LOCATOR_ID" foreign="M_LOCATOR_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="FACT_ACCT_USER1">
- <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="FACT_ACCT_USER2">
- <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
<foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_FACT_ACCT">
<reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
</foreign-key>
diff -r 8925b5958741 -r 314b084f21b9
src-db/database/model/tables/I_GLJOURNAL.xml
--- a/src-db/database/model/tables/I_GLJOURNAL.xml Wed Feb 24 19:00:37
2010 +0100
+++ b/src-db/database/model/tables/I_GLJOURNAL.xml Thu Feb 25 11:42:46
2010 +0100
@@ -322,12 +322,6 @@
<foreign-key foreignTable="M_PRODUCT" name="I_GLJOURNAL_M_PRODUCT">
<reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="I_GLJOURNAL_USER1">
- <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
- <foreign-key foreignTable="C_ELEMENTVALUE" name="I_GLJOURNAL_USER2">
- <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
- </foreign-key>
<check name="I_GLJOURNAL_I_ISIMPORTED_CHK"><![CDATA[I_ISIMPORTED IN
('Y', 'N')]]></check>
<check name="I_GLJOURNAL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<check name="I_GLJOURNAL_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y',
'N')]]></check>
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql
Wed Feb 24 19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql
Thu Feb 25 11:42:46 2010 +0100
@@ -34,7 +34,7 @@
LPAD(B.CODEBANK,4,'0')||LPAD(B.CODEBRANCH,4,'0')||LPAD(ba.CODEACCOUNT,10,'0')
AS N_CUENTA,
LPAD(B.DIGITCONTROL||ba.DIGITCONTROL,2,'0')
AS DC,
REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(UPPER(
- RPAD(C.NAME,36)
+ RPAD(O.NAME,36)
),'Á','A'),'É','E'),'Í','I'),'Ó','O'),'Ú','U')
AS NOMBRE,
REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(UPPER(
RPAD(l.Address1||' '||l.Address2,36)
@@ -58,10 +58,12 @@
ad_client c,
c_Bank b,
ad_orgInfo oi,
+ ad_org o,
c_remittance r,
c_Location l
where c.Ad_Client_ID = r.AD_Client_Id
and r.AD_ORG_ID = oi.ad_org_id
+ and oi.ad_org_id = o.ad_org_id
and r.C_BANKACCOUNT_ID = ba.c_bankAccount_id
and b.c_bank_id = ba.c_bank_Id
and oi.C_Location_ID = l.C_location_ID
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/ad_actionButton/CreateFile_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFile_data.xsql Wed Feb
24 19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFile_data.xsql Thu Feb
25 11:42:46 2010 +0100
@@ -31,7 +31,7 @@
select B.NAME AS BANK,b.codebank, b.codebranch,
b.DIGITCONTROL as digitcontrol1, ba.DIGITCONTROL as digitcontrol2,
ba.CODEACCOUNT,
LPAD(B.CODEBANK,4,'0')||LPAD(B.CODEBRANCH,4,'0')||B.DIGITCONTROL||ba.DIGITCONTROL||LPAD(ba.CODEACCOUNT,10,'0')
AS N_CUENTA,
- lpad(rpad(c.NAME,40,' '),46,' ') AS ENTIDAD, rpad(c.NAME,40,' ') AS
ENTIDAD19, oi.TAXID AS NIF, TO_CHAR(r.Duedate
,'DD')||TO_CHAR(r.Duedate,'MM')||TO_CHAR(r.Duedate,'YY')AS DATEPLANNED,
TO_CHAR(now(), 'DD')||TO_CHAR(now(), 'MM')||TO_CHAR(now(), 'YY') AS HOY,
+ lpad(rpad(o.NAME,40,' '),46,' ') AS ENTIDAD, rpad(o.NAME,40,' ') AS
ENTIDAD19, oi.TAXID AS NIF, TO_CHAR(r.Duedate
,'DD')||TO_CHAR(r.Duedate,'MM')||TO_CHAR(r.Duedate,'YY')AS DATEPLANNED,
TO_CHAR(now(), 'DD')||TO_CHAR(now(), 'MM')||TO_CHAR(now(), 'YY') AS HOY,
LPAD(RPAD(LPAD(B.CODEBANK,4,'0')||LPAD(B.CODEBRANCH,4,'0'),74,' '),94,' ') AS
ENTOFI, LPAD(B.INE_NUMBER,61,' ') AS INE,
'' AS TERCERO,
'' AS FECHA_FACTURA, '' AS FECHA_VENCIMIENTO, '' AS PAYAMT, '' AS
CREDITCARDNUMBER, '' AS N_FACTURA, '' AS N_FACTURA19, '' AS CIUDAD, '' AS
DIRECCION,
@@ -39,9 +39,11 @@
from c_remittance r, ad_client c,
c_bankAccount ba,
c_Bank
b,
- ad_orgInfo
oi
+ ad_orgInfo
oi,
+ ad_org o
where r.ad_client_id = c.ad_client_id
and r.AD_ORG_ID = oi.ad_org_id
+ and oi.ad_org_id = o.ad_org_id
and r.C_BANKACCOUNT_ID = ba.c_bankAccount_id
and b.c_bank_id = ba.c_bank_Id
and r.C_Remittance_ID = ?
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html Wed Feb
24 19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html Thu Feb
25 11:42:46 2010 +0100
@@ -78,7 +78,7 @@
<script language="JavaScript" type="text/javascript">
function onLoadDo(){
- setProcessingMode('window', false); this.windowTables = new
Array(
+ this.windowTables = new Array(
new windowTableId('client', 'buttonSearch'),
new windowTableId('tdbottomButtons', 'buttonProcess')
);
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/ad_process/ApplyModules.html
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.html Wed Feb 24
19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.html Thu Feb 25
11:42:46 2010 +0100
@@ -132,7 +132,6 @@
}
var charn= document.getElementById('warningsAndErrors').innerHTML.length;
if(charn>2000){
- stopAddingWarns=true;
document.getElementById('warningsAndErrors').innerHTML += "<p
class='CL_RSW_ta_line'>" + "and more..." + "</p>";
}
else{
@@ -236,6 +235,8 @@
progList_changeNode(node, 'Error');
progList_changeIcon(node, 'Error');
}
+ //Make a final call to requesterrorstate, to get the last
errors/warnings, if they were any
+ submitXmlHttpRequest(askForErrorStatus, null,
"REQUESTLASTERRORSTATE", "ApplyModulesCallServlet.html", false, null, null);
}
}
return true;
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java
Wed Feb 24 19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java
Thu Feb 25 11:42:46 2010 +0100
@@ -51,7 +51,9 @@
if (vars.commandIn("UPDATESTATUS")) {
update(response, vars);
} else if (vars.commandIn("REQUESTERRORSTATE")) {
- requesterrorstate(response, vars);
+ requesterrorstate(response, vars, false);
+ } else if (vars.commandIn("REQUESTLASTERRORSTATE")) {
+ requesterrorstate(response, vars, true);
} else if (vars.commandIn("GETERR")) {
getError(response, vars);
}
@@ -145,6 +147,52 @@
return resp;
}
+ private ApplyModulesResponse fillErrorResponse(VariablesSecureApp vars,
String state,
+ String defaultState) {
+
+ ApplyModulesResponse resp = new ApplyModulesResponse();
+ resp.setState(Integer.parseInt(state.replace("RB", "")));
+ PreparedStatement ps2 = null;
+ PreparedStatement ps3 = null;
+ boolean warning = false;
+ boolean error = false;
+ try {
+ ps2 = getPreparedStatement("SELECT MESSAGE, LINE_NUMBER FROM
AD_ERROR_LOG WHERE ERROR_LEVEL='ERROR' ORDER BY CREATED DESC");
+ ps2.executeQuery();
+ ResultSet rs2 = ps2.getResultSet();
+ ArrayList<String> errors = new ArrayList<String>();
+ if (rs2.next()) {
+ error = true; // there is at least an error in this state
+ errors.add(rs2.getString(1));
+ }
+ resp.setErrors(errors.toArray(new String[0]));
+
+ ps3 = getPreparedStatement("SELECT MESSAGE FROM AD_ERROR_LOG ORDER BY
CREATED DESC");
+ ps3.executeQuery();
+ ResultSet rs3 = ps3.getResultSet();
+ if (rs3.next()) {
+ resp.setLastmessage(rs3.getString(1));
+ } else {
+ resp.setLastmessage("");
+ }
+
+ if (error)
+ resp.setStatusofstate("Error");
+ else if (warning)
+ resp.setStatusofstate("Warning");
+ else
+ resp.setStatusofstate(defaultState);
+ } catch (Exception e) {
+ } finally {
+ try {
+ releasePreparedStatement(ps3);
+ releasePreparedStatement(ps2);
+ } catch (SQLException e2) {
+ }
+ }
+ return resp;
+ }
+
/**
* This method is called via AJAX through a timer in the rebuild window. It
returns the current
* status of the system (and warnings/errors that happened in the current
state)
@@ -185,13 +233,19 @@
* state. This method will be called when the Rebuild Window notices that
one or more steps were
* not updated and the build process already finished them
*/
- private void requesterrorstate(HttpServletResponse response,
VariablesSecureApp vars) {
+ private void requesterrorstate(HttpServletResponse response,
VariablesSecureApp vars,
+ boolean lastError) {
String ln = vars.getSessionValue("ApplyModules|Last_Line_Number_Log");
if (ln == null || ln.equals("")) {
return;
}
String state = vars.getStringParameter("reqStatus");
- ApplyModulesResponse resp = fillResponse(vars, state, "Success");
+ ApplyModulesResponse resp;
+ if (lastError) {
+ resp = fillErrorResponse(vars, state, "Success");
+ } else {
+ resp = fillResponse(vars, state, "Success");
+ }
response.setContentType("text/plain; charset=UTF-8");
try {
final PrintWriter out = response.getWriter();
@@ -219,15 +273,16 @@
PreparedStatement ps;
PreparedStatement ps2;
try {
- ps = getPreparedStatement("SELECT MESSAGE FROM AD_ERROR_LOG WHERE
ERROR_LEVEL='ERROR'");
+ ps = getPreparedStatement("SELECT MESSAGE FROM AD_ERROR_LOG WHERE
ERROR_LEVEL='ERROR' ORDER BY CREATED DESC");
ps.executeQuery();
ResultSet rs = ps.getResultSet();
if (rs.next()) {
error.setType("Error");
error.setTitle(Utility.messageBD(myPool, "Error", vars.getLanguage()));
- error.setMessage(Utility.messageBD(myPool, "BuildError",
vars.getLanguage())
- + "<a href=\"http://wiki.openbravo.com/wiki/ERP/2.50/Update_Tips\";
target=\"_blank\" class=\"MessageBox_TextLink\">"
- + Utility.messageBD(myPool, "ThisLink", vars.getLanguage()) +
"</a>");
+ error
+ .setMessage(Utility.messageBD(myPool, "BuildError",
vars.getLanguage())
+ + "<a
href=\"http://wiki.openbravo.com/wiki/ERP/2.50/Update_Tips\"; target=\"_blank\"
class=\"MessageBox_TextLink\">"
+ + Utility.messageBD(myPool, "ThisLink", vars.getLanguage()) +
"</a>");
} else {
ps2 = getPreparedStatement("SELECT MESSAGE FROM AD_ERROR_LOG WHERE
ERROR_LEVEL='WARN'");
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Wed Feb 24
19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Thu Feb 25
11:42:46 2010 +0100
@@ -78,7 +78,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6472')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6490')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert("Your browser's cache has outdated files. Please clean it and
reload the page.");
}
diff -r 8925b5958741 -r 314b084f21b9
src/org/openbravo/erpCommon/utility/AntExecutor.java
--- a/src/org/openbravo/erpCommon/utility/AntExecutor.java Wed Feb 24
19:00:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/AntExecutor.java Thu Feb 25
11:42:46 2010 +0100
@@ -49,6 +49,7 @@
private PrintWriter out;
private FileOutputStream logFile;
+ private PrintStream ps;
/**
* Initializes a newly created AntExecutor object assigning it the build.xml
file to execute tasks
@@ -146,7 +147,7 @@
final DefaultLogger logger1 = new DefaultLogger();
try {
logFile = new FileOutputStream(file);
- PrintStream ps = new PrintStream(logFile);
+ ps = new PrintStream(logFile);
logger1.setOutputPrintStream(ps);
logger1.setErrorPrintStream(ps);
logger1.setMessageOutputLevel(Project.MSG_INFO);
@@ -300,6 +301,7 @@
public void closeLogFile() {
try {
if (logFile != null) {
+ ps.flush();
logFile.close();
}
} catch (IOException e) {
diff -r 8925b5958741 -r 314b084f21b9 web/js/utils.js
--- a/web/js/utils.js Wed Feb 24 19:00:37 2010 +0100
+++ b/web/js/utils.js Thu Feb 25 11:42:46 2010 +0100
@@ -72,7 +72,7 @@
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
