details: /erp/devel/int/rev/ab0bf0e61a2b
changeset: 6440:ab0bf0e61a2b
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 00:50:20 2010 +0100
summary: Fixed issue 11979: Added message in Login_F1.html to check supported
browser
details: /erp/devel/int/rev/bcf6fd2138cf
changeset: 6441:bcf6fd2138cf
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 01:40:02 2010 +0100
summary: Related to issue 11979: Changed alert order
details: /erp/devel/int/rev/075a157e924f
changeset: 6442:075a157e924f
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Feb 17 09:04:48 2010 +0100
summary: Fixes issue 11811: Changed query get email recipients
details: /erp/devel/int/rev/04ebb675f301
changeset: 6443:04ebb675f301
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Feb 16 16:42:43 2010 +0100
summary: Fixes Hudson erp_devel_int-pgsql-db-full-consistency-test #348
details: /erp/devel/int/rev/e18ac7648234
changeset: 6444:e18ac7648234
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Feb 16 16:52:57 2010 +0100
summary: Fixes Hudson erp_devel_int-pgsql-db-full-consistency-test #348
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 2 +
src-db/database/sourcedata/AD_ELEMENT.xml | 11 -
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql | 1 +
src/org/openbravo/erpCommon/security/Login_F1.html | 6 +-
web/js/utils.js | 90 ++++++++++-
5 files changed, 97 insertions(+), 13 deletions(-)
diffs (169 lines):
diff -r 982eb382c6a4 -r e18ac7648234 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 16 22:55:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 16 16:52:57 2010 +0100
@@ -269387,6 +269387,8 @@
<!--7890366979602CEFE040007F01013334--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7890366979602CEFE040007F01013334--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7890366979602CEFE040007F01013334--> <NAME><![CDATA[Order]]></NAME>
+<!--7890366979602CEFE040007F01013334--> <DESCRIPTION><![CDATA[A unique and
often automatically generated identifier for a sales order.]]></DESCRIPTION>
+<!--7890366979602CEFE040007F01013334--> <HELP><![CDATA[Unique identifier and
a reference to a Sales Order originating from the document sequence defined for
this document type.]]></HELP>
<!--7890366979602CEFE040007F01013334-->
<COLUMNNAME><![CDATA[C_Order_ID]]></COLUMNNAME>
<!--7890366979602CEFE040007F01013334-->
<AD_TABLE_ID><![CDATA[CE9AFF5F51B846AEAB0B6CBF829092CD]]></AD_TABLE_ID>
<!--7890366979602CEFE040007F01013334-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
diff -r 982eb382c6a4 -r e18ac7648234 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Feb 16 22:55:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Feb 16 16:52:57 2010 +0100
@@ -25187,17 +25187,6 @@
<!--7891269C8424655DE040007F010155CE-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7891269C8424655DE040007F010155CE--></AD_ELEMENT>
-<!--78A3787B4823C096E040007F0101250E--><AD_ELEMENT>
-<!--78A3787B4823C096E040007F0101250E-->
<AD_ELEMENT_ID><![CDATA[78A3787B4823C096E040007F0101250E]]></AD_ELEMENT_ID>
-<!--78A3787B4823C096E040007F0101250E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--78A3787B4823C096E040007F0101250E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--78A3787B4823C096E040007F0101250E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--78A3787B4823C096E040007F0101250E-->
<COLUMNNAME><![CDATA[EM_Fin_Addpayment]]></COLUMNNAME>
-<!--78A3787B4823C096E040007F0101250E--> <NAME><![CDATA[Add Payment]]></NAME>
-<!--78A3787B4823C096E040007F0101250E-->
<PRINTNAME><![CDATA[EM_Fin_Addpayment]]></PRINTNAME>
-<!--78A3787B4823C096E040007F0101250E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78A3787B4823C096E040007F0101250E--></AD_ELEMENT>
-
<!--78B98ED0452F560FE040007F0101777C--><AD_ELEMENT>
<!--78B98ED0452F560FE040007F0101777C-->
<AD_ELEMENT_ID><![CDATA[78B98ED0452F560FE040007F0101777C]]></AD_ELEMENT_ID>
<!--78B98ED0452F560FE040007F0101777C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 982eb382c6a4 -r e18ac7648234
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql
--- a/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql Tue Feb
16 22:55:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql Tue Feb
16 16:52:57 2010 +0100
@@ -163,6 +163,7 @@
where ar.ad_alertrule_id = ?
and ar.ad_client_id = u.ad_client_id
and u.ad_client_id = c.ad_client_id
+ and ar.ad_user_id = u.ad_user_id
and c.requestuser is not null
and c.requestuserpw is not null
and u.email is not null
diff -r 982eb382c6a4 -r e18ac7648234
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue Feb 16
22:55:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Tue Feb 16
16:52:57 2010 +0100
@@ -78,9 +78,13 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6434')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6440')) || (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");
+ }
}
function onResizeDo() {
diff -r 982eb382c6a4 -r e18ac7648234 web/js/utils.js
--- a/web/js/utils.js Tue Feb 16 22:55:57 2010 +0100
+++ b/web/js/utils.js Tue Feb 16 16:52:57 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 = '6434';
+ var number = '6440';
return number;
}
@@ -89,6 +89,94 @@
}
}
+/**
+* Gets information of the browser
+* @param {name} string Required - It could be "name", "version",
"nameAndVersion" or "complete"
+*/
+function getBrowserInfo(param) {
+ var navUserAgent = navigator.userAgent.toUpperCase();
+ var browserName = "Unknown";
+ var browserVersion = "";
+ var browserMajorVersion = "";
+ var i=0
+ if (navUserAgent.indexOf("MSIE") >= 0) {
+ browserName = "Microsoft Internet Explorer";
+ i=navUserAgent.indexOf("MSIE")+5;
+ } else if (navUserAgent.indexOf("FIREFOX") >= 0) {
+ browserName = "Mozilla Firefox";
+ i=navUserAgent.indexOf("FIREFOX")+8;
+ } else if (navUserAgent.indexOf("ICEWEASEL") >= 0) {
+ browserName = "IceWeasel";
+ i=navUserAgent.indexOf("ICEWEASEL")+10;
+ } else if (navUserAgent.indexOf("CHROME") >= 0) {
+ browserName = "Google Chrome";
+ i=navUserAgent.indexOf("CHROME")+7;
+ } else if (navUserAgent.indexOf("OPERA") >= 0) {
+ browserName = "Opera";
+ if (navUserAgent.indexOf("VERSION") != -1) {
+ i=navUserAgent.indexOf("VERSION")+8;
+ } else {
+ i=navUserAgent.indexOf("OPERA")+6;
+ }
+ } else if (navUserAgent.indexOf("SAFARI") >= 0) {
+ browserName = "Safari";
+ if (navUserAgent.indexOf("VERSION") != -1) {
+ i=navUserAgent.indexOf("VERSION")+8;
+ } else {
+ i=navUserAgent.indexOf("SAFARI")+7;
+ }
+ } else if (navUserAgent.indexOf("NETSCAPE") >= 0) {
+ browserName = "Netscape";
+ i=navUserAgent.indexOf("NETSCAPE")+9;
+ } else if (navUserAgent.indexOf("KONQUEROR") >= 0) {
+ browserName = "Konqueror";
+ i=navUserAgent.indexOf("KONQUEROR")+10;
+ }
+ if (i!=0) {
+ while (navUserAgent.substring(i, i+1) != " " && navUserAgent.substring(i,
i+1) != ";" && i < navUserAgent.length) {
+ browserVersion += navUserAgent.substring(i, i+1);
+ i++;
+ }
+ }
+ var browserNameAndVersion = browserName + " " + browserVersion;
+ browserMajorVersion = browserVersion;
+ if (browserMajorVersion.indexOf(".") != -1) {
+ browserMajorVersion = browserMajorVersion.substring(0,
browserVersion.indexOf("."));
+ browserMajorVersion = parseInt(browserMajorVersion);
+ }
+ if (param == "name") {
+ return browserName;
+ } else if (param == "version") {
+ return browserVersion;
+ } else if (param == "majorVersion") {
+ return browserMajorVersion;
+ } else if (param == "nameAndVersion" || typeof param == "undefined" || param
== "" || param == null) {
+ return browserNameAndVersion;
+ } else {
+ return false;
+ }
+}
+
+/**
+* Checks if the browser is a supported one
+*/
+function checkBrowserCompatibility() {
+ var browserName = getBrowserInfo("name");
+ var browserVersion = getBrowserInfo("version");
+ var browserMajorVersion = getBrowserInfo("majorVersion");
+ var isValid = false;
+ if (browserName.toUpperCase().indexOf('FIREFOX') != -1 ||
browserName.toUpperCase().indexOf('ICEWEASEL') != -1) {
+ if (browserMajorVersion >= 3) {
+ isValid = true;
+ }
+ } else if (browserName.toUpperCase().indexOf('INTERNET EXPLORER') != -1) {
+ if (browserMajorVersion >= 7) {
+ isValid = true;
+ }
+ }
+ return isValid;
+}
+
function getObjAttribute(obj, attribute) {
attribute = attribute.toLowerCase();
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
