details: /erp/devel/main/rev/d01a4c3322d5
changeset: 6463: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/main/rev/c447fba6b715
changeset: 6464: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/main/rev/0072e9cf853c
changeset: 6465: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/main/rev/857f1006c455
changeset: 6466: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/main/rev/a3591dda3f70
changeset: 6467: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/main/rev/53e2c2b7a0aa
changeset: 6468: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
details: /erp/devel/main/rev/8e9fc50c9bd5
changeset: 6469:8e9fc50c9bd5
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Feb 18 12:19:28 2010 +0530
summary: Fixes Issue 12274: The copy lines process on the sales invoice does
not manage well the organization.
details: /erp/devel/main/rev/c4f60fa9011b
changeset: 6470:c4f60fa9011b
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Thu Feb 18 14:55:14 2010 +0530
summary: Fixes Issue 12072: Create lines from in Settlement doesn't calculate
properly.
details: /erp/devel/main/rev/7d345428351b
changeset: 6471:7d345428351b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 10:59:35 2010 +0100
summary: fixed bug 12330: Exception in logs when maximum concurrent users
reached
details: /erp/devel/main/rev/0e103bbcd82f
changeset: 6472:0e103bbcd82f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 11:12:09 2010 +0100
summary: fixed issue 11039: Active Session Detection
details: /erp/devel/main/rev/eecd5dedc0dc
changeset: 6473:eecd5dedc0dc
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 12:36:08 2010 +0100
summary: fixed bug 11113: Small fixes and improved comments
details: /erp/devel/main/rev/160a70ea1019
changeset: 6474:160a70ea1019
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 13:44:45 2010 +0100
summary: related to issue 11039: Fixed access problem for not admin roles
details: /erp/devel/main/rev/4a410faff223
changeset: 6475:4a410faff223
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Feb 18 18:22:05 2010 +0530
summary: Fixes Issue 11793: An error appears when a csv is imported in Import
File Loader.
details: /erp/devel/main/rev/7b157c34710b
changeset: 6476:7b157c34710b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 14:40:22 2010 +0100
summary: fixed erp_devel_int-pgsql-db-full-consistency-test build #353
details: /erp/devel/main/rev/063c6835e1aa
changeset: 6477:063c6835e1aa
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Feb 18 16:12:39 2010 +0100
summary: fixed bug 12338: In settlement window, in relation mode, are not
shown all records
details: /erp/devel/main/rev/d75125e81ced
changeset: 6478:d75125e81ced
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 18 18:22:01 2010 +0100
summary: Added comment to javadoc
details: /erp/devel/main/rev/6a9cac2e2b48
changeset: 6479:6a9cac2e2b48
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 19 00:46:41 2010 +0100
summary: Mini-refactor of keyControl utils.js function
details: /erp/devel/main/rev/2109285b6dcc
changeset: 6480:2109285b6dcc
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 19 16:35:40 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/main/rev/d22bdcc83354
changeset: 6481:d22bdcc83354
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 19 16:35:42 2010 +0100
summary: Update AD_MODULE version for obx generation
diffstat:
src-db/database/model/tables/AD_SESSION.xml | 4 +
src-db/database/model/tables/FIN_PAYMENT.xml | 4 -
src-db/database/sourcedata/AD_COLUMN.xml | 60
++--
src-db/database/sourcedata/AD_ELEMENT.xml | 13 +
src-db/database/sourcedata/AD_FIELD.xml | 35
++-
src-db/database/sourcedata/AD_MODULE.xml | 4
+-
src/org/openbravo/base/model/domaintype/DomainType.java | 3 +
src/org/openbravo/base/secureApp/LoginHandler.java | 10
+-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 5
+-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql | 13
+-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html | 32
++-
src/org/openbravo/erpCommon/ad_forms/FileImport.java | 17
+-
src/org/openbravo/erpCommon/ad_forms/FileImport_data.xsql | 5
+-
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/obps/ActivationKey.java | 80
+++++-
src/org/openbravo/erpCommon/security/Login_F1.html | 4
+-
src/org/openbravo/erpCommon/utility/VerticalMenu.java | 31
++-
src/org/openbravo/reference/ui/UIText.java | 2
+-
web/js/utils.js | 119
++-------
24 files changed, 313 insertions(+), 202 deletions(-)
diffs (truncated from 1012 to 300 lines):
diff -r e18ac7648234 -r d22bdcc83354 src-db/database/model/tables/AD_SESSION.xml
--- a/src-db/database/model/tables/AD_SESSION.xml Tue Feb 16 16:52:57
2010 +0100
+++ b/src-db/database/model/tables/AD_SESSION.xml Fri Feb 19 16:35:42
2010 +0100
@@ -57,6 +57,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="LAST_SESSION_PING" primaryKey="false" required="false"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_SESSION_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r e18ac7648234 -r d22bdcc83354
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 Fri Feb 19 16:35:42
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 d22bdcc83354 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 Fri Feb 19 16:35:42 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>
@@ -274885,6 +274856,37 @@
<!--7FCA79F6A6804336A083FEE0C8964D6E-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--7FCA79F6A6804336A083FEE0C8964D6E--></AD_COLUMN>
+<!--7FDC7A18D86783EAE040007F01012E08--><AD_COLUMN>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_COLUMN_ID><![CDATA[7FDC7A18D86783EAE040007F01012E08]]></AD_COLUMN_ID>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FDC7A18D86783EAE040007F01012E08--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FDC7A18D86783EAE040007F01012E08--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FDC7A18D86783EAE040007F01012E08--> <NAME><![CDATA[Last Ping]]></NAME>
+<!--7FDC7A18D86783EAE040007F01012E08--> <DESCRIPTION><![CDATA[Time for the
last time the session sent ping]]></DESCRIPTION>
+<!--7FDC7A18D86783EAE040007F01012E08--> <HELP><![CDATA[Stores the last time
the session made ping through the UI. In this way it is possible to determine
whether the browser was closed without doing log out.]]></HELP>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<COLUMNNAME><![CDATA[Last_Session_Ping]]></COLUMNNAME>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_TABLE_ID><![CDATA[566]]></AD_TABLE_ID>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7FDC7A18D86783EAE040007F01012E08--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7FDC7A18D86783EAE040007F01012E08--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7FDC7A18D86783EAE040007F01012E08--> <SEQNO><![CDATA[31]]></SEQNO>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_ELEMENT_ID><![CDATA[7FDC7A18D86883EAE040007F01012E08]]></AD_ELEMENT_ID>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7FDC7A18D86783EAE040007F01012E08--> <POSITION><![CDATA[15]]></POSITION>
+<!--7FDC7A18D86783EAE040007F01012E08-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7FDC7A18D86783EAE040007F01012E08--></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 e18ac7648234 -r d22bdcc83354 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Feb 16 16:52:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Feb 19 16:35:42 2010 +0100
@@ -25505,6 +25505,19 @@
<!--7EC3B5CF03729057E040007F010110BF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7EC3B5CF03729057E040007F010110BF--></AD_ELEMENT>
+<!--7FDC7A18D86883EAE040007F01012E08--><AD_ELEMENT>
+<!--7FDC7A18D86883EAE040007F01012E08-->
<AD_ELEMENT_ID><![CDATA[7FDC7A18D86883EAE040007F01012E08]]></AD_ELEMENT_ID>
+<!--7FDC7A18D86883EAE040007F01012E08-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FDC7A18D86883EAE040007F01012E08--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FDC7A18D86883EAE040007F01012E08--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FDC7A18D86883EAE040007F01012E08-->
<COLUMNNAME><![CDATA[Last_Session_Ping]]></COLUMNNAME>
+<!--7FDC7A18D86883EAE040007F01012E08--> <NAME><![CDATA[Last Ping]]></NAME>
+<!--7FDC7A18D86883EAE040007F01012E08--> <PRINTNAME><![CDATA[Last
Ping]]></PRINTNAME>
+<!--7FDC7A18D86883EAE040007F01012E08--> <DESCRIPTION><![CDATA[Time for the
last time the session sent ping]]></DESCRIPTION>
+<!--7FDC7A18D86883EAE040007F01012E08--> <HELP><![CDATA[Stores the last time
the session made ping through the UI. In this way it is possible to determine
whether the browser was closed without doing log out.]]></HELP>
+<!--7FDC7A18D86883EAE040007F01012E08-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7FDC7A18D86883EAE040007F01012E08--></AD_ELEMENT>
+
<!--80044AA0505611DEBC12001CC0B8EF99--><AD_ELEMENT>
<!--80044AA0505611DEBC12001CC0B8EF99-->
<AD_ELEMENT_ID><![CDATA[80044AA0505611DEBC12001CC0B8EF99]]></AD_ELEMENT_ID>
<!--80044AA0505611DEBC12001CC0B8EF99-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r e18ac7648234 -r d22bdcc83354 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Feb 16 16:52:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Feb 19 16:35:42 2010 +0100
@@ -82221,7 +82221,7 @@
<!--6616--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--6616--> <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
<!--6616--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6616--> <SEQNO><![CDATA[10]]></SEQNO>
+<!--6616--> <SEQNO><![CDATA[20]]></SEQNO>
<!--6616--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--6616--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6616--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -82244,7 +82244,7 @@
<!--6617--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--6617--> <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
<!--6617--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6617--> <SEQNO><![CDATA[20]]></SEQNO>
+<!--6617--> <SEQNO><![CDATA[30]]></SEQNO>
<!--6617--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--6617--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6617--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -85968,7 +85968,7 @@
<!--6837--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--6837--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6837--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6837--> <SEQNO><![CDATA[40]]></SEQNO>
+<!--6837--> <SEQNO><![CDATA[50]]></SEQNO>
<!--6837--> <SORTNO><![CDATA[1]]></SORTNO>
<!--6837--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--6837--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -192851,7 +192851,7 @@
<!--766E946AA3718787E040007F010131F4-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--766E946AA3718787E040007F010131F4-->
<DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
<!--766E946AA3718787E040007F010131F4--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--766E946AA3718787E040007F010131F4--> <SEQNO><![CDATA[30]]></SEQNO>
+<!--766E946AA3718787E040007F010131F4--> <SEQNO><![CDATA[40]]></SEQNO>
<!--766E946AA3718787E040007F010131F4--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--766E946AA3718787E040007F010131F4-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--766E946AA3718787E040007F010131F4-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -192874,7 +192874,7 @@
<!--766E946AA3738787E040007F010131F4-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--766E946AA3738787E040007F010131F4-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--766E946AA3738787E040007F010131F4--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--766E946AA3738787E040007F010131F4--> <SEQNO><![CDATA[50]]></SEQNO>
+<!--766E946AA3738787E040007F010131F4--> <SEQNO><![CDATA[70]]></SEQNO>
<!--766E946AA3738787E040007F010131F4--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--766E946AA3738787E040007F010131F4-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--766E946AA3738787E040007F010131F4-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -192897,7 +192897,7 @@
<!--7693B3D758076F59E040007F01012A25-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--7693B3D758076F59E040007F01012A25-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--7693B3D758076F59E040007F01012A25--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--7693B3D758076F59E040007F01012A25--> <SEQNO><![CDATA[0]]></SEQNO>
+<!--7693B3D758076F59E040007F01012A25--> <SEQNO><![CDATA[10]]></SEQNO>
<!--7693B3D758076F59E040007F01012A25--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--7693B3D758076F59E040007F01012A25-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--7693B3D758076F59E040007F01012A25-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -194379,6 +194379,29 @@
<!--7EC3B5CF03739057E040007F010110BF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7EC3B5CF03739057E040007F010110BF--></AD_FIELD>
+<!--7FDC7A18D86B83EAE040007F01012E08--><AD_FIELD>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<AD_FIELD_ID><![CDATA[7FDC7A18D86B83EAE040007F01012E08]]></AD_FIELD_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <NAME><![CDATA[Last Ping]]></NAME>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <DESCRIPTION><![CDATA[Time for the
last time the session sent ping]]></DESCRIPTION>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <HELP><![CDATA[Stores the last time
the session made ping through the UI. In this way it is possible to determine
whether the browser was closed without doing log out.]]></HELP>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <AD_TAB_ID><![CDATA[475]]></AD_TAB_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<AD_COLUMN_ID><![CDATA[7FDC7A18D86783EAE040007F01012E08]]></AD_COLUMN_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--7FDC7A18D86B83EAE040007F01012E08--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7FDC7A18D86B83EAE040007F01012E08-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7FDC7A18D86B83EAE040007F01012E08--></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 e18ac7648234 -r d22bdcc83354 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Feb 16 16:52:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 19 16:35:42 2010 +0100
@@ -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.16006]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.16480]]></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>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r e18ac7648234 -r d22bdcc83354
src/org/openbravo/base/model/domaintype/DomainType.java
--- a/src/org/openbravo/base/model/domaintype/DomainType.java Tue Feb 16
16:52:57 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/DomainType.java Fri Feb 19
16:35:42 2010 +0100
@@ -67,6 +67,9 @@
/**
* Is called during the initialization of the model layer. Is called after
the
* {...@link #setModelProvider(ModelProvider)}.
+ *
+ * Note: any subclass should clean-up and close database connections or
hibernate sessions. If
+ * this is not done then the update.database task may hang when disabling
foreign keys.
*/
void initialize();
diff -r e18ac7648234 -r d22bdcc83354
src/org/openbravo/base/secureApp/LoginHandler.java
--- a/src/org/openbravo/base/secureApp/LoginHandler.java Tue Feb 16
16:52:57 2010 +0100
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java Fri Feb 19
16:35:42 2010 +0100
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2001-2009 Openbravo S.L.
+ * Copyright (C) 2001-2010 Openbravo S.L.
* Licensed under the Apache Software License version 2.0
* You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
distributed
@@ -105,19 +105,19 @@
String title = Utility.messageBD(myPool,
"NUMBER_OF_CONCURRENT_USERS_REACHED_TITLE", vars
.getLanguage());
goToRetry(res, vars, msg, title, msgType, action);
- break;
+ return;
case NUMBER_OF_SOFT_USERS_REACHED:
msg = Utility.messageBD(myPool, "NUMBER_OF_SOFT_USERS_REACHED",
vars.getLanguage());
title = Utility.messageBD(myPool,
"NUMBER_OF_SOFT_USERS_REACHED_TITLE", vars.getLanguage());
action = "../security/Menu.html";
msgType = "Warning";
goToRetry(res, vars, msg, title, msgType, action);
- break;
+ return;
case OPS_INSTANCE_NOT_ACTIVE:
msg = Utility.messageBD(myPool, "OPS_INSTANCE_NOT_ACTIVE",
vars.getLanguage());
title = Utility.messageBD(myPool, "OPS_INSTANCE_NOT_ACTIVE_TITLE",
vars.getLanguage());
goToRetry(res, vars, msg, title, msgType, action);
- break;
+ return;
case MODULE_EXPIRED:
msg = Utility.messageBD(myPool, "OPS_MODULE_EXPIRED",
vars.getLanguage());
title = Utility.messageBD(myPool, "OPS_MODULE_EXPIRED_TITLE",
vars.getLanguage());
@@ -127,7 +127,7 @@
}
msg += expiredMoudules.toString();
goToRetry(res, vars, msg, title, msgType, action);
- break;
+ return;
}
SystemInformation sysInfo =
OBDal.getInstance().get(SystemInformation.class, "0");
diff -r e18ac7648234 -r d22bdcc83354
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java Tue Feb
16 16:52:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java Fri Feb
19 16:35:42 2010 +0100
@@ -79,12 +79,13 @@
CopyFromInvoiceData[] data = CopyFromInvoiceData.select(conn, this,
strInvoice, Utility
.getContext(this, vars, "#User_Client", windowId),
Utility.getContext(this, vars,
"#User_Org", windowId));
+ CopyFromInvoiceData[] dataInvoice =
CopyFromInvoiceData.selectInvoice(conn, this, strKey);
------------------------------------------------------------------------------
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
