details: /erp/devel/int/rev/caf8b663e118
changeset: 6493:caf8b663e118
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Feb 25 19:05:35 2010 +0100
summary: Fixes issue 9654: Copy Budget button doesn't work
details: /erp/devel/int/rev/c74c3267b3d6
changeset: 6494:c74c3267b3d6
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 22:17:51 2010 +0100
summary: Related to issue 12479: Added getFrame('main') to get the global _FS
from any position
details: /erp/devel/int/rev/61c9e5a782b8
changeset: 6495:61c9e5a782b8
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 22:50:58 2010 +0100
summary: Related to issue 12479: Now appStatus.js has relative references
details: /erp/devel/int/rev/62d59b8bccd2
changeset: 6496:62d59b8bccd2
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 22:51:20 2010 +0100
summary: Related to issue 12479: Now menuKeyboard.js has relative references
details: /erp/devel/int/rev/a941418a7769
changeset: 6497:a941418a7769
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 22:51:42 2010 +0100
summary: Related to issue 12479: Now windowKeyboard.js has relative references
details: /erp/devel/int/rev/2080f081ea9d
changeset: 6498:2080f081ea9d
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 23:01:43 2010 +0100
summary: Related to issue 12479: Now messages.js has relative references
details: /erp/devel/int/rev/7752ca268c05
changeset: 6499:7752ca268c05
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 25 23:56:04 2010 +0100
summary: Related to issue 12479: Improved performance of getFrame('main')
details: /erp/devel/int/rev/54ef20cb0ea6
changeset: 6500:54ef20cb0ea6
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 00:21:59 2010 +0100
summary: Related to issue 12479: Now VerticalMenu.html has relative references
details: /erp/devel/int/rev/72eca7fdf291
changeset: 6501:72eca7fdf291
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 00:23:19 2010 +0100
summary: Related to issue 12479: Now messages.js has relative references
-part2
details: /erp/devel/int/rev/54a5031f082a
changeset: 6502:54a5031f082a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 00:41:27 2010 +0100
summary: Related to issue 12479: Now VerticalMenu.html has relative
references -part2
details: /erp/devel/int/rev/41394a20bc95
changeset: 6503:41394a20bc95
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 01:02:11 2010 +0100
summary: Related to issue 12479: Now Role.html has relative references
details: /erp/devel/int/rev/9a277c7cbcfb
changeset: 6504:9a277c7cbcfb
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 01:06:55 2010 +0100
summary: Related to issue 12479: Now utils.js has relative references -part1
details: /erp/devel/int/rev/e3ea620ab5cb
changeset: 6505:e3ea620ab5cb
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Feb 26 10:52:34 2010 +0530
summary: Fixes Issue 11023: Message displayed when a grid does not appear in
time is not correct
details: /erp/devel/int/rev/fa2d62c2d918
changeset: 6506:fa2d62c2d918
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Feb 26 10:00:14 2010 +0100
summary: fixed issue 12481: Sortable drop down list
diffstat:
src-db/database/model/functions/C_BUDGET_COPY.xml | 10 +-
src-db/database/model/tables/AD_REF_LIST.xml | 4 +
src-db/database/model/triggers/AD_REF_LIST_MOD_TRG.xml | 4 +-
src-db/database/sourcedata/AD_COLUMN.xml | 31 +++++
src-db/database/sourcedata/AD_FIELD.xml | 32 +++++-
src-db/database/sourcedata/AD_MESSAGE.xml | 2 +-
src/org/openbravo/erpCommon/ad_forms/Role.html | 14 +-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
src/org/openbravo/erpCommon/utility/ComboTableData.java | 7 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html | 9 +-
web/js/appStatus.js | 24 ++--
web/js/menuKeyboard.js | 6 +-
web/js/messages.js | 20 ++-
web/js/utils.js | 92 ++++++++++++----
web/js/windowKeyboard.js | 2 +-
15 files changed, 185 insertions(+), 74 deletions(-)
diffs (truncated from 580 to 300 lines):
diff -r 45df2e899eb3 -r fa2d62c2d918
src-db/database/model/functions/C_BUDGET_COPY.xml
--- a/src-db/database/model/functions/C_BUDGET_COPY.xml Thu Feb 25 17:22:26
2010 +0100
+++ b/src-db/database/model/functions/C_BUDGET_COPY.xml Fri Feb 26 10:00:14
2010 +0100
@@ -33,7 +33,6 @@
v_Client_ID VARCHAR2(32);
v_Org_ID VARCHAR2(32);
v_User_ID VARCHAR2(32);
- v_BudgetLine_ID VARCHAR2(32);
v_Period_ID VARCHAR2(32);
Cur_BudgetLine RECORD;
BEGIN
@@ -73,14 +72,14 @@
AND p1.PeriodNo=p2.PeriodNo
AND p2.C_Period_ID=Cur_BudgetLine.C_Period_ID;
v_ResultStr:='InsertBudgetLines';
- Ad_Sequence_Next('C_BudgetLine', v_Client_ID, v_BudgetLine_ID) ;
INSERT
INTO C_BudgetLine
(
C_Budgetline_ID, AD_Client_ID,
- AD_Org_ID, Isactive,
+ AD_Org_ID, Isactive,
Created, Createdby,
- Updated, Updatedby,
+ Updated, Updatedby,
+ C_AcctSchema_ID,
C_ElementValue_ID, C_Period_ID,
C_Currency_ID, C_Uom_ID,
Qty, M_Product_ID,
@@ -95,10 +94,11 @@
)
VALUES
(
- v_BudgetLine_ID, v_Client_ID,
+ GET_UUID(), v_Client_ID,
v_Org_ID, 'Y',
now(), v_User_ID,
now(), v_User_ID,
+ Cur_BudgetLine.C_AcctSchema_ID,
Cur_BudgetLine.C_ElementValue_ID, v_Period_ID,
Cur_BudgetLine.C_Currency_ID, Cur_BudgetLine.C_Uom_ID,
Cur_BudgetLine.Qty, Cur_BudgetLine.M_Product_ID,
diff -r 45df2e899eb3 -r fa2d62c2d918
src-db/database/model/tables/AD_REF_LIST.xml
--- a/src-db/database/model/tables/AD_REF_LIST.xml Thu Feb 25 17:22:26
2010 +0100
+++ b/src-db/database/model/tables/AD_REF_LIST.xml Fri Feb 26 10:00:14
2010 +0100
@@ -61,6 +61,10 @@
<default><![CDATA[0]]></default>
<onCreateDefault><![CDATA[SELECT AD_MODULE_ID FROM AD_MODULE WHERE
AD_MODULE_ID<>'0' AND TYPE='M']]></onCreateDefault>
</column>
+ <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL"
size="10,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_MODULE" name="AD_REF_LIST_AD_MODULE">
<reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
</foreign-key>
diff -r 45df2e899eb3 -r fa2d62c2d918
src-db/database/model/triggers/AD_REF_LIST_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_REF_LIST_MOD_TRG.xml Thu Feb 25
17:22:26 2010 +0100
+++ b/src-db/database/model/triggers/AD_REF_LIST_MOD_TRG.xml Fri Feb 26
10:00:14 2010 +0100
@@ -15,7 +15,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): ______________________________________.
************************************************************************/
@@ -71,7 +71,7 @@
COALESCE(:NEW.AD_Reference_ID , '.') != COALESCE(:OLD.AD_Reference_ID
, '.') OR
COALESCE(:NEW.ValidFrom , TO_DATE('01-01-1900', 'DD-MM-YYYY')) !=
COALESCE(:OLD.ValidFrom , TO_DATE('01-01-1900', 'DD-MM-YYYY')) OR
COALESCE(:NEW.ValidTo , TO_DATE('01-01-1900', 'DD-MM-YYYY')) !=
COALESCE(:OLD.ValidTo , TO_DATE('01-01-1900', 'DD-MM-YYYY')) OR
- 1=2) THEN
+ COALESCE(:NEW.SeqNo, -1) != COALESCE(:OLD.SeqNo, -1)) THEN
RAISE_APPLICATION_ERROR(-20532, 'Cannot update an object in a module not
in developement and without an active template');
END IF;
END IF;
diff -r 45df2e899eb3 -r fa2d62c2d918 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Feb 25 17:22:26 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Feb 26 10:00:14 2010 +0100
@@ -274889,6 +274889,37 @@
<!--7FDC7A18D86783EAE040007F01012E08-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--7FDC7A18D86783EAE040007F01012E08--></AD_COLUMN>
+<!--807CAEE23A0AE8F1E040007F01013A3C--><AD_COLUMN>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_COLUMN_ID><![CDATA[807CAEE23A0AE8F1E040007F01013A3C]]></AD_COLUMN_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <NAME><![CDATA[Sequence
Number]]></NAME>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <DESCRIPTION><![CDATA[The order of
records in a specified document.]]></DESCRIPTION>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <HELP><![CDATA[The Sequence indicates
the order of records]]></HELP>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<COLUMNNAME><![CDATA[Seqno]]></COLUMNNAME>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_TABLE_ID><![CDATA[104]]></AD_TABLE_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <SEQNO><![CDATA[21]]></SEQNO>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_ELEMENT_ID><![CDATA[566]]></AD_ELEMENT_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--807CAEE23A0AE8F1E040007F01013A3C--> <POSITION><![CDATA[16]]></POSITION>
+<!--807CAEE23A0AE8F1E040007F01013A3C-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--807CAEE23A0AE8F1E040007F01013A3C--></AD_COLUMN>
+
<!--80F1BCD61F0F11DE8BE5DF56446CB1D8--><AD_COLUMN>
<!--80F1BCD61F0F11DE8BE5DF56446CB1D8-->
<AD_COLUMN_ID><![CDATA[80F1BCD61F0F11DE8BE5DF56446CB1D8]]></AD_COLUMN_ID>
<!--80F1BCD61F0F11DE8BE5DF56446CB1D8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 45df2e899eb3 -r fa2d62c2d918 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu Feb 25 17:22:26 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Feb 26 10:00:14 2010 +0100
@@ -1599,7 +1599,7 @@
<!--189--> <DISPLAYLOGIC><![cda...@parentreference_id@='17']]></DISPLAYLOGIC>
<!--189--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--189--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--189--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--189--> <SEQNO><![CDATA[100]]></SEQNO>
<!--189--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--189--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--189--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -1623,7 +1623,7 @@
<!--190--> <DISPLAYLOGIC><![cda...@parentreference_id@='17']]></DISPLAYLOGIC>
<!--190--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--190--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--190--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--190--> <SEQNO><![CDATA[110]]></SEQNO>
<!--190--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--190--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--190--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -2938,7 +2938,7 @@
<!--264--> <DISPLAYLOGIC><![cda...@parentreference_id@='17']]></DISPLAYLOGIC>
<!--264--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--264--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--264--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--264--> <SEQNO><![CDATA[90]]></SEQNO>
<!--264--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--264--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--264--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -194402,6 +194402,32 @@
<!--7FDC7A18D86B83EAE040007F01012E08-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7FDC7A18D86B83EAE040007F01012E08--></AD_FIELD>
+<!--807CB1125A891B22E040007F01013A3F--><AD_FIELD>
+<!--807CB1125A891B22E040007F01013A3F-->
<AD_FIELD_ID><![CDATA[807CB1125A891B22E040007F01013A3F]]></AD_FIELD_ID>
+<!--807CB1125A891B22E040007F01013A3F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--807CB1125A891B22E040007F01013A3F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--807CB1125A891B22E040007F01013A3F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--807CB1125A891B22E040007F01013A3F--> <NAME><![CDATA[Sequence
Number]]></NAME>
+<!--807CB1125A891B22E040007F01013A3F--> <DESCRIPTION><![CDATA[Order the
elements in the list will be displayed in the drop down list]]></DESCRIPTION>
+<!--807CB1125A891B22E040007F01013A3F--> <HELP><![CDATA[-If the value of this
field is null for all the elements in the list, the list will be sorted
alphabetically.
+-If all the elements have this value set, they will be ordered taken into
account it.
+-If some of the elements have it and some not, the ones having it will appear
at the beginning of the list sorted by Sequence Number, the rest of them will
be shown at the end ordered alphabetically.]]></HELP>
+<!--807CB1125A891B22E040007F01013A3F-->
<ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--807CB1125A891B22E040007F01013A3F--> <AD_TAB_ID><![CDATA[104]]></AD_TAB_ID>
+<!--807CB1125A891B22E040007F01013A3F-->
<AD_COLUMN_ID><![CDATA[807CAEE23A0AE8F1E040007F01013A3C]]></AD_COLUMN_ID>
+<!--807CB1125A891B22E040007F01013A3F-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--807CB1125A891B22E040007F01013A3F-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--807CB1125A891B22E040007F01013A3F--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--807CB1125A891B22E040007F01013A3F--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--807CB1125A891B22E040007F01013A3F--> <SORTNO><![CDATA[1]]></SORTNO>
+<!--807CB1125A891B22E040007F01013A3F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--807CB1125A891B22E040007F01013A3F-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--807CB1125A891B22E040007F01013A3F-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--807CB1125A891B22E040007F01013A3F-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--807CB1125A891B22E040007F01013A3F-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--807CB1125A891B22E040007F01013A3F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--807CB1125A891B22E040007F01013A3F--></AD_FIELD>
+
<!--80C65FD7819B43638FB4A0413A91A65D--><AD_FIELD>
<!--80C65FD7819B43638FB4A0413A91A65D-->
<AD_FIELD_ID><![CDATA[80C65FD7819B43638FB4A0413A91A65D]]></AD_FIELD_ID>
<!--80C65FD7819B43638FB4A0413A91A65D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 45df2e899eb3 -r fa2d62c2d918 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 25 17:22:26 2010 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Feb 26 10:00:14 2010 +0100
@@ -30148,7 +30148,7 @@
<!--2E175A7785AD4313B24D3E9034B05BAD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2E175A7785AD4313B24D3E9034B05BAD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2E175A7785AD4313B24D3E9034B05BAD--> <VALUE><![CDATA[JS24]]></VALUE>
-<!--2E175A7785AD4313B24D3E9034B05BAD--> <MSGTEXT><![CDATA[The data can be
incomplete because the server not replayed at specified time. Check the
connection with the server. ]]></MSGTEXT>
+<!--2E175A7785AD4313B24D3E9034B05BAD--> <MSGTEXT><![CDATA[Server is taking
too long to respond. Data shown could be incomplete, please check the
connection with the server and try again.]]></MSGTEXT>
<!--2E175A7785AD4313B24D3E9034B05BAD--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--2E175A7785AD4313B24D3E9034B05BAD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2E175A7785AD4313B24D3E9034B05BAD--></AD_MESSAGE>
diff -r 45df2e899eb3 -r fa2d62c2d918
src/org/openbravo/erpCommon/ad_forms/Role.html
--- a/src/org/openbravo/erpCommon/ad_forms/Role.html Thu Feb 25 17:22:26
2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/Role.html Fri Feb 26 10:00:14
2010 +0100
@@ -73,12 +73,12 @@
document.frmMain.warehouse.value = document.frmInput.inputWarehouse.value;
if (document.frmInput.saveok.value == "true") {
- window.opener.top.document.location.href="../security/Menu.html";
+ getFrame('main').document.location.href="../security/Menu.html";
}
// Refresh menu
-// opener.top.document.getElementById("paramFrameMenu").src =
"../utility/VerticalMenu.html";
+// getFrame('main').document.getElementById("paramFrameMenu").src =
"../utility/VerticalMenu.html";
// Refresh main window
-// opener.top.document.getElementById("paramFrame1").src =
"../utility/Home.html";
+// getFrame('main').document.getElementById("paramFrame1").src =
"../utility/Home.html";
// }
}
@@ -99,12 +99,12 @@
}
function saveOptions() {
if (document.frmMain.TextDirection.value=="RTL") {
- window.opener.top.isRTL=true;
+ getFrame('main').isRTL=true;
} else {
- window.opener.top.isRTL=false;
+ getFrame('main').isRTL=false;
}
submitCommandForm("SAVE", false);
- window.opener.setMenuLoading(true);
+ getFrame('frameMenu').setMenuLoading(true);
return false;
}
</script>
@@ -173,7 +173,7 @@
<script language="JavaScript" type="text/javascript">
function onLoadDo(){
if
(document.getElementById('messageBoxID').className.indexOf('MessageBoxError')
!= -1) {
- window.opener.setMenuLoading(false);
+ getFrame('frameMenu').setMenuLoading(false);
}
this.windowTables = new Array(
new windowTableId('clientIndex'),
diff -r 45df2e899eb3 -r fa2d62c2d918
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Thu Feb 25
17:22:26 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Fri Feb 26
10:00:14 2010 +0100
@@ -78,7 +78,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6490')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6494')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert("Your browser's cache has outdated files. Please clean it and
reload the page.");
}
diff -r 45df2e899eb3 -r fa2d62c2d918
src/org/openbravo/erpCommon/utility/ComboTableData.java
--- a/src/org/openbravo/erpCommon/utility/ComboTableData.java Thu Feb 25
17:22:26 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/ComboTableData.java Fri Feb 26
10:00:14 2010 +0100
@@ -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-2009 Openbravo SL
+ * All portions are Copyright (C) 2001-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -238,8 +238,8 @@
if (!Utility.isUUIDString(_reference)) {
// Looking reference by name! This shouldn't be used, name is prone
to change. It only
// looks in core names
- _reference = ComboTableQueryData.getReferenceID(getPool(),
_reference,
- getReferenceType());
+ _reference = ComboTableQueryData
+ .getReferenceID(getPool(), _reference, getReferenceType());
if (_reference == null || _reference.equals("")) {
throw new OBException(Utility.messageBD(pool, "ReferenceNotFound",
vars.getLanguage())
+ " " + _reference);
@@ -688,6 +688,7 @@
"ISACTIVE");
addWhereParameter("@ACTUAL_VALUE@", "ACTUAL_VALUE", "ISACTIVE");
}
+ addOrderByField("td" + myIndex + ".SeqNo");
addOrderByField("(CASE WHEN td_trl" + myIndex + ".name IS NULL THEN td" +
myIndex
+ ".name ELSE td_trl" + myIndex + ".name END)");
}
diff -r 45df2e899eb3 -r fa2d62c2d918
src/org/openbravo/erpCommon/utility/VerticalMenu.html
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.html Thu Feb 25
17:22:26 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.html Fri Feb 26
10:00:14 2010 +0100
@@ -137,7 +137,7 @@
}
function validate(action, form, value) {
- var appFrame = top.frames.appFrame;
+ var appFrame = getFrame('appFrame');
try {
var isUserChanges = appFrame.isUserChanges;
@@ -169,12 +169,15 @@
function getAppUrlFromMenu() {
var url = window.location.href;
url = url.replace("/utility/VerticalMenu.html","");
+ if (url.lastIndexOf("#") == url.length - 1) {
+ url = url.substring(0, url.length - 1);
+ }
return url;
------------------------------------------------------------------------------
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
