details: /erp/devel/main/rev/68c8c4203f91
changeset: 8183:68c8c4203f91
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Aug 13 14:34:37 2010 +0200
summary: Fixed issue 14160: Now there is no error msgbox in grid if frameMenu
is not avaialable
details: /erp/devel/main/rev/72d5c78abbfb
changeset: 8184:72d5c78abbfb
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Aug 13 21:05:48 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/3ca7a8ff74e7
changeset: 8185:3ca7a8ff74e7
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Aug 13 21:05:49 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/js/messages.js | 4 ++--
web/js/utils.js | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diffs (66 lines):
diff -r 3d3e7ced4ea6 -r 3ca7a8ff74e7 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 13 11:04:07 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 13 21:05:49 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18184]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--> <COMMERCIAL_TIER><![CDATA[NA]]></COMMERCIAL_TIER>
<!--0--></AD_MODULE>
diff -r 3d3e7ced4ea6 -r 3ca7a8ff74e7
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Fri Aug 13
11:04:07 2010 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Fri Aug 13
21:05:49 2010 +0200
@@ -111,7 +111,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('8117')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('8155')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 3d3e7ced4ea6 -r 3ca7a8ff74e7 web/js/messages.js
--- a/web/js/messages.js Fri Aug 13 11:04:07 2010 +0200
+++ b/web/js/messages.js Fri Aug 13 21:05:49 2010 +0200
@@ -77,7 +77,7 @@
_language = LNG_POR_DEFECTO;
}
}
- var total = arrMessages.length;
+ var total = (arrMessages ? arrMessages.length : 0);
for (var i=0;i<total;i++) {
if (arrMessages[i].language == _language)
if (arrMessages[i].message == index)
@@ -95,7 +95,7 @@
_language = LNG_POR_DEFECTO;
}
}
- var total = arrMessages.length;
+ var total = (arrMessages ? arrMessages.length : 0);
for (var i=0;i<total;i++) {
if (arrMessages[i].language == _language)
if (arrMessages[i].message == index)
diff -r 3d3e7ced4ea6 -r 3ca7a8ff74e7 web/js/utils.js
--- a/web/js/utils.js Fri Aug 13 11:04:07 2010 +0200
+++ b/web/js/utils.js Fri Aug 13 21:05:49 2010 +0200
@@ -89,7 +89,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 = '8117';
+ var number = '8155';
return number;
}
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
