details: /erp/devel/int/rev/d01a4c3322d5
changeset: 6445:d01a4c3322d5
user: Rajagopal Baskaran <rajagopal.baskaran <at> openbravo.com>
date: Wed Feb 17 16:33:08 2010 +0530
summary: Fixes issue 12010: Account selector is slow with more than 20.000
details: /erp/devel/int/rev/c447fba6b715
changeset: 6446:c447fba6b715
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 12:17:55 2010 +0100
summary: Related to issue 11979: Changed alert text
details: /erp/devel/int/rev/0072e9cf853c
changeset: 6447:0072e9cf853c
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 13:05:52 2010 +0100
summary: Related to issue 12008: Added a separator bar between both
notifications
details: /erp/devel/int/rev/857f1006c455
changeset: 6448:857f1006c455
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 17 13:18:30 2010 +0100
summary: Removed column from FIN_Payment table.
details: /erp/devel/int/rev/a3591dda3f70
changeset: 6449:a3591dda3f70
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Wed Feb 17 20:30:13 2010 +0530
summary: Fixes Issue 11976: Accounting Report doesn't calculate properly
parents'amount
details: /erp/devel/int/rev/53e2c2b7a0aa
changeset: 6450:53e2c2b7a0aa
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 17 16:57:18 2010 +0100
summary: fixed bug 11113: Number of changes pending is not correct on
upgrading
diffstat:
src-db/database/model/tables/FIN_PAYMENT.xml | 4 -
src-db/database/sourcedata/AD_COLUMN.xml | 29
--------
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql | 8 +-
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java | 2 +-
src/org/openbravo/erpCommon/info/Account.html | 33
+++++++--
src/org/openbravo/erpCommon/info/Account.java | 28
++++---
src/org/openbravo/erpCommon/info/Account.xml | 1 +
src/org/openbravo/erpCommon/security/Login_F1.html | 4 +-
web/js/utils.js | 2 +-
10 files changed, 50 insertions(+), 63 deletions(-)
diffs (256 lines):
diff -r e18ac7648234 -r 53e2c2b7a0aa
src-db/database/model/tables/FIN_PAYMENT.xml
--- a/src-db/database/model/tables/FIN_PAYMENT.xml Tue Feb 16 16:52:57
2010 +0100
+++ b/src-db/database/model/tables/FIN_PAYMENT.xml Wed Feb 17 16:57:18
2010 +0100
@@ -101,10 +101,6 @@
<default/>
<onCreateDefault/>
</column>
- <column name="ADD_SCHEDULED_PAYMENTS" primaryKey="false"
required="false" type="CHAR" size="1" autoIncrement="false">
- <default/>
- <onCreateDefault/>
- </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_PAYMENTS">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r e18ac7648234 -r 53e2c2b7a0aa src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 16 16:52:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 17 16:57:18 2010 +0100
@@ -272918,35 +272918,6 @@
<!--7DC34559B3F3B45BE040007F0100784A-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--7DC34559B3F3B45BE040007F0100784A--></AD_COLUMN>
-<!--7DC34559B3F4B45BE040007F0100784A--><AD_COLUMN>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_COLUMN_ID><![CDATA[7DC34559B3F4B45BE040007F0100784A]]></AD_COLUMN_ID>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7DC34559B3F4B45BE040007F0100784A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7DC34559B3F4B45BE040007F0100784A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<NAME><![CDATA[ADD_Scheduled_Payments]]></NAME>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<COLUMNNAME><![CDATA[ADD_Scheduled_Payments]]></COLUMNNAME>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--7DC34559B3F4B45BE040007F0100784A--> <ISKEY><![CDATA[N]]></ISKEY>
-<!--7DC34559B3F4B45BE040007F0100784A--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--7DC34559B3F4B45BE040007F0100784A--> <SEQNO><![CDATA[320]]></SEQNO>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_ELEMENT_ID><![CDATA[8337CDFBF2904C07AB7F9D69E1536663]]></AD_ELEMENT_ID>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7DC34559B3F4B45BE040007F0100784A--> <POSITION><![CDATA[26]]></POSITION>
-<!--7DC34559B3F4B45BE040007F0100784A-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--7DC34559B3F4B45BE040007F0100784A--></AD_COLUMN>
-
<!--7DC34559B3F5B45BE040007F0100784A--><AD_COLUMN>
<!--7DC34559B3F5B45BE040007F0100784A-->
<AD_COLUMN_ID><![CDATA[7DC34559B3F5B45BE040007F0100784A]]></AD_COLUMN_ID>
<!--7DC34559B3F5B45BE040007F0100784A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Tue Feb
16 16:52:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Wed Feb
17 16:57:18 2010 +0100
@@ -270,7 +270,7 @@
total = ModuleManagementData.selectUpdate(this);
if (!total.equals("0")) {
if (!rt.isEmpty()) {
- rt += " ";
+ rt += " / ";
}
rt += total
+ " "
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql Tue Feb
16 16:52:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql Wed Feb
17 16:57:18 2010 +0100
@@ -12,7 +12,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) 2008-2009 Openbravo SL
+ * All portions are Copyright (C) 2008-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -74,11 +74,11 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
SELECT COUNT(*) AS TOTAL
- FROM (SELECT 1
+ FROM (SELECT AD_MODULE_ID
FROM AD_MODULE
WHERE STATUS IN ('I','U','P')
- UNION ALL
- SELECT 1
+ UNION
+ SELECT AD_MODULE_ID
FROM AD_MODULE_INSTALL) A
</Sql>
</SqlMethod>
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java
--- a/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java
Tue Feb 16 16:52:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java
Wed Feb 17 16:57:18 2010 +0100
@@ -391,7 +391,7 @@
data[i].levelAccount).intValue()
&& data[j].parent.equals(data[i].id)) {
String total = data[j].total;
- count.add(new BigDecimal(total));
+ count = count.add(new BigDecimal(total));
}
}
data[i].total = String.valueOf(count);
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/info/Account.html
--- a/src/org/openbravo/erpCommon/info/Account.html Tue Feb 16 16:52:57
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account.html Wed Feb 17 16:57:18
2010 +0100
@@ -52,7 +52,7 @@
}
function onloadFunctions() {
-
+ keyArray[keyArray.length] = new keyArrayItem("ENTER",
"openSearch(null, null, '../info/AccountElementValue.html',
'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmSelector', 'inpAccount',
'inpAccount_DES',document.frmSelector.inpAccount_DES.value, 'Command',
'KEY');", "inpAccount_DES", "null");
}
</script>
<script language="JavaScript" type="text/javascript" id="selectedColumn">
@@ -229,13 +229,30 @@
<div
id="reportAD_Org_ID"></div>
</select>
</td>
- <td class="TitleCell"><span
class="LabelText">Account</span></td>
- <td class="Combo_ContentCell"
colspan="2">
- <select class="Combo
Combo_TwoCells_width required" required="true" name="inpAccount"
id="inpAccount">
- <option
value=""></option>
- <div
id="reportAccount_ID"></div>
- </select>
- </td>
+ <td class="TitleCell"><span
class="LabelText">Account</span></td>
+ <td class="TextBox_btn_ContentCell" colspan="2">
+ <table border="0" cellspacing="0" cellpadding="0"
summary="" style="padding-top: 0px;">
+ <tr>
+ <td class="TextBox_ContentCell">
+ <input type="hidden"
name="inpAcctSchema" id="inpAcctSchema" value=""></input>
+ <input type="hidden" name="inpAccount"
id="inpAccount" value=""></input>
+ <input class="dojoValidateValid
TextBox_btn_TwoCells_width" type="text" name="inpAccount_DES"
id="inpAccount_DES" maxlength="20" value=""></input>
+ </td>
+ <td class="FieldButton_ContentCell">
+ <a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Account'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="openSearch(null, null, '../info/AccountElementValue.html',
'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmSelector', 'inpAccount',
'inpAccount_DES', document.frmSelector.inpAccount_DES.value, 'inpAcctSchema',
document.frmSelector.inpAcctSchema.value);return false;">
+ <table class="FieldButton"
onmouseout="this.className='FieldButton';window.status='';return true;"
onmouseover="this.className='FieldButton_hover';window.status='Search';return
true;" onmousedown="this.className='FieldButton_active';return true;"
onmouseup="this.className='FieldButton';return true;">
+ <tr>
+ <td class="FieldButton_bg">
+ <img alt="Account"
class="FieldButton_Icon FieldButton_Icon_Account" title="Account"
src="../../../../../web/images/blank.gif" border="0"></img>
+ </td>
+ </tr>
+ </table>
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+
</tr>
<tr>
<td class="TitleCell"><span
class="LabelText">Product</span></td>
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/info/Account.java
--- a/src/org/openbravo/erpCommon/info/Account.java Tue Feb 16 16:52:57
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account.java Wed Feb 17 16:57:18
2010 +0100
@@ -266,6 +266,7 @@
xmlDocument.setParameter("grid_SortCols", "1");
xmlDocument.setParameter("grid_SortDirs", "ASC");
xmlDocument.setParameter("grid_Default", "0");
+ xmlDocument.setParameter("inpAcctSchema", strAcctSchema);
response.setContentType("text/html; charset=UTF-8");
PrintWriter out = response.getWriter();
@@ -347,8 +348,8 @@
String strOrderBy = SelectorUtility.buildOrderByClause(strOrderCols,
strOrderDirs);
page = TableSQLData.calcAndGetBackendPage(vars,
"DebtPaymentInfo.currentPage");
if (vars.getStringParameter("movePage", "").length() > 0) {
- // on movePage action force executing countRows again
- strNewFilter = "";
+ // on movePage action force executing countRows again
+ strNewFilter = "";
}
int oldOffset = offset;
offset = (page * TableSQLData.maxRowsPerGridPage) + offset;
@@ -358,18 +359,18 @@
// or
// first
// load
- String rownum = "0", oraLimit1 = null, oraLimit2 = null,
pgLimit = null;
- if (this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
- oraLimit1 = String.valueOf(offset +
TableSQLData.maxRowsPerGridPage);
- oraLimit2 = (offset + 1) + " AND " + oraLimit1;
- rownum = "ROWNUM";
- } else {
- pgLimit = TableSQLData.maxRowsPerGridPage + " OFFSET " +
offset;
- }
- strNumRows = AccountData.countRows(this, rownum,strAcctSchema,
strAlias, strCombination,
+ String rownum = "0", oraLimit1 = null, oraLimit2 = null, pgLimit =
null;
+ if (this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
+ oraLimit1 = String.valueOf(offset +
TableSQLData.maxRowsPerGridPage);
+ oraLimit2 = (offset + 1) + " AND " + oraLimit1;
+ rownum = "ROWNUM";
+ } else {
+ pgLimit = TableSQLData.maxRowsPerGridPage + " OFFSET " + offset;
+ }
+ strNumRows = AccountData.countRows(this, rownum, strAcctSchema,
strAlias, strCombination,
strOrganization, strAccount, strProduct, strBPartner,
strProject, strCampaign, "",
Utility.getContext(this, vars, "#User_Client", "Account"),
Utility.getContext(this,
- vars, "#User_Org", "Account"),pgLimit, oraLimit1, oraLimit2);
+ vars, "#User_Org", "Account"), pgLimit, oraLimit1,
oraLimit2);
vars.setSessionValue("AccountInfo.numrows", strNumRows);
} else {
strNumRows = vars.getSessionValue("AccountInfo.numrows");
@@ -430,7 +431,8 @@
strRowsData.append(" <title>").append(title).append("</title>\n");
strRowsData.append("
<description>").append(description).append("</description>\n");
strRowsData.append(" </status>\n");
- strRowsData.append(" <rows numRows=\"").append(strNumRows).append("\"
backendPage=\"" + page + "\">\n");
+ strRowsData.append(" <rows numRows=\"").append(strNumRows).append(
+ "\" backendPage=\"" + page + "\">\n");
if (data != null && data.length > 0) {
for (int j = 0; j < data.length; j++) {
strRowsData.append(" <tr>\n");
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/info/Account.xml
--- a/src/org/openbravo/erpCommon/info/Account.xml Tue Feb 16 16:52:57
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account.xml Wed Feb 17 16:57:18
2010 +0100
@@ -30,6 +30,7 @@
<PARAMETER id="grid" name="grid_SortCols" attribute="sortcols" />
<PARAMETER id="grid" name="grid_SortDirs" attribute="sortdirs" />
<PARAMETER id="grid" name="grid_Default" attribute="defaultrow" />
+ <PARAMETER id="inpAcctSchema" name="inpAcctSchema" attribute="value"/>
<structure name="structure1">
<FIELD id="fieldValidCombination"
attribute="value">cValidcombinationId</FIELD>
<FIELD id="fieldAlias" attribute="value">alias</FIELD>
diff -r e18ac7648234 -r 53e2c2b7a0aa
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue Feb 16
16:52:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Wed Feb 17
16:57:18 2010 +0100
@@ -78,12 +78,12 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6440')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6446')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert("Your browser's cache has outdated files. Please clean it and
reload the page.");
}
if (!checkBrowserCompatibility()) {
- alert("Your browser \"" + getBrowserInfo("nameAndVersion") + "\" is not
officially supported.\n\nOpenbravo has not been tested on your browser.\n\nYou
can continue at your own risk or use one of these supported browsers:\n *
Mozilla Firefox 3.0 or higher\n * Microsoft Internet Explorer 7.0 or higher");
+ alert("Your browser is not officially supported.\n\nYou can continue at
your own risk or access the application with one of the supported browsers:\n *
Mozilla Firefox 3.0 or higher\n * Microsoft Internet Explorer 7.0 or higher");
}
}
diff -r e18ac7648234 -r 53e2c2b7a0aa web/js/utils.js
--- a/web/js/utils.js Tue Feb 16 16:52:57 2010 +0100
+++ b/web/js/utils.js Wed Feb 17 16:57:18 2010 +0100
@@ -72,7 +72,7 @@
* Return a number that would be checked at the Login screen to know if the
file is cached with the correct version
*/
function getCurrentRevision() {
- var number = '6440';
+ var number = '6446';
return number;
}
------------------------------------------------------------------------------
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
