details: /erp/devel/main/rev/120af24b8412
changeset: 8597:120af24b8412
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Oct 20 18:35:09 2010 +0200
summary: Fixes issue 0014750: I can not access to the application when there
are many organizations.
It has been modified the logic that builds the list of organizations reading
directly the table AD_ROLE_ORGACCESS instead the ORGLIST and CLIENTLIST fields
The fields ORGLIST and CLIENTLIST has been marked as deprecated
The AD_ROLE_ORG_ACCESS has been shielded if the organizations list or clients
list is too long
details: /erp/devel/main/rev/5fddff493e93
changeset: 8598:5fddff493e93
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Oct 20 18:56:45 2010 +0200
summary: Fixes issue 14927: Rename Make Payment and Receive Payment
Make Payment and Receive Payment windows need to be renamed (Payment Out and
Payment In)
to be compatible with the Quick Create feature of the new navigation bar (New
Make Payment sounds bad)
details: /erp/devel/main/rev/b5df3f5030eb
changeset: 8599:b5df3f5030eb
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Oct 21 04:27:28 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml | 18 ++-
src-db/database/sourcedata/AD_COLUMN.xml | 4 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 +-
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 36 +++---
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +-
src-db/database/sourcedata/AD_WINDOW.xml | 4 +-
src/org/openbravo/base/secureApp/DefaultOptions_data.xsql | 2 +-
src/org/openbravo/base/secureApp/LoginUtils.java | 57 +++++++++++-
src/org/openbravo/base/secureApp/Seguridad_data.xsql | 9 +-
src/org/openbravo/erpCommon/ad_forms/Role.java | 4 +-
src/org/openbravo/erpCommon/ad_forms/RoleCombo_data.xsql | 4 +-
src/org/openbravo/erpCommon/ad_process/ClientCombo_data.xsql | 5 +-
13 files changed, 112 insertions(+), 49 deletions(-)
diffs (truncated from 506 to 300 lines):
diff -r f1e98b6f7415 -r b5df3f5030eb
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
--- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Wed Oct 20
16:55:10 2010 +0200
+++ b/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml Thu Oct 21
04:27:28 2010 +0000
@@ -61,17 +61,21 @@
)
LOOP
IF(v_Client_ID <> Cur_Org.AD_Client_ID) THEN
- v_Client_ID:=Cur_Org.AD_Client_ID;
- IF(LENGTH(v_ClientList) <> 0) THEN
- v_ClientList:=v_ClientList || ',';
+ IF (v_ClientList IS NULL OR (LENGTH(v_ClientList) +
LENGTH(Cur_Org.AD_Client_ID) + 1 < 2000)) THEN
+ v_Client_ID:=Cur_Org.AD_Client_ID;
+ IF(LENGTH(v_ClientList) <> 0) THEN
+ v_ClientList:=v_ClientList || ',';
+ END IF;
+ v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
END IF;
- v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
END IF;
-- Org
- IF(LENGTH(v_OrgList) <> 0) THEN
- v_OrgList:=v_OrgList || ',';
+ IF (v_OrgList IS NULL OR (LENGTH(v_OrgList) + LENGTH(Cur_Org.AD_Org_ID)
+ 1 < 2000)) THEN
+ IF(LENGTH(v_OrgList) <> 0) THEN
+ v_OrgList:=v_OrgList || ',';
+ END IF;
+ v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
END IF;
- v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
END LOOP;
-- Org
--
diff -r f1e98b6f7415 -r b5df3f5030eb src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Oct 20 16:55:10 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 21 04:27:28 2010 +0000
@@ -8113,7 +8113,7 @@
<!--535--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--535--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--535--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--535--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--535--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
<!--535--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--535--> <POSITION><![CDATA[12]]></POSITION>
<!--535--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -8146,7 +8146,7 @@
<!--536--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--536--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--536--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--536--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--536--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
<!--536--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--536--> <POSITION><![CDATA[13]]></POSITION>
<!--536--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
diff -r f1e98b6f7415 -r b5df3f5030eb
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Wed Oct 20 16:55:10
2010 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Oct 21 04:27:28
2010 +0000
@@ -16252,7 +16252,7 @@
<!--3634A40511484AF08B91A29AFF9D6CA0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--3634A40511484AF08B91A29AFF9D6CA0--> <ACTION><![CDATA[W]]></ACTION>
<!--3634A40511484AF08B91A29AFF9D6CA0-->
<AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
-<!--3634A40511484AF08B91A29AFF9D6CA0-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.Lines]]></CLASSNAME>
+<!--3634A40511484AF08B91A29AFF9D6CA0-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.Lines]]></CLASSNAME>
<!--3634A40511484AF08B91A29AFF9D6CA0--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--3634A40511484AF08B91A29AFF9D6CA0-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--3634A40511484AF08B91A29AFF9D6CA0--></AD_MODEL_OBJECT>
@@ -17268,7 +17268,7 @@
<!--7C541AC0C751FDD7E040007F01016B4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C541AC0C751FDD7E040007F01016B4D--> <ACTION><![CDATA[W]]></ACTION>
<!--7C541AC0C751FDD7E040007F01016B4D-->
<AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
-<!--7C541AC0C751FDD7E040007F01016B4D-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.Header]]></CLASSNAME>
+<!--7C541AC0C751FDD7E040007F01016B4D-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.Header]]></CLASSNAME>
<!--7C541AC0C751FDD7E040007F01016B4D--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--7C541AC0C751FDD7E040007F01016B4D-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--7C541AC0C751FDD7E040007F01016B4D--></AD_MODEL_OBJECT>
@@ -17292,7 +17292,7 @@
<!--7C667247C7BC2B30E040007F01010C8C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C667247C7BC2B30E040007F01010C8C--> <ACTION><![CDATA[W]]></ACTION>
<!--7C667247C7BC2B30E040007F01010C8C-->
<AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
-<!--7C667247C7BC2B30E040007F01010C8C-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.Lines]]></CLASSNAME>
+<!--7C667247C7BC2B30E040007F01010C8C-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.Lines]]></CLASSNAME>
<!--7C667247C7BC2B30E040007F01010C8C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--7C667247C7BC2B30E040007F01010C8C-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--7C667247C7BC2B30E040007F01010C8C--></AD_MODEL_OBJECT>
@@ -17775,7 +17775,7 @@
<!--9FFDFC752BDA410CAC856F6F00BB6CF8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9FFDFC752BDA410CAC856F6F00BB6CF8--> <ACTION><![CDATA[W]]></ACTION>
<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->
<AD_TAB_ID><![CDATA[F7A52FDAAA0346EFA07D53C125B40404]]></AD_TAB_ID>
-<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.Header]]></CLASSNAME>
+<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.Header]]></CLASSNAME>
<!--9FFDFC752BDA410CAC856F6F00BB6CF8--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--9FFDFC752BDA410CAC856F6F00BB6CF8--></AD_MODEL_OBJECT>
@@ -18031,7 +18031,7 @@
<!--D394D71C4BAC480EA29D9258366B079B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D394D71C4BAC480EA29D9258366B079B--> <ACTION><![CDATA[W]]></ACTION>
<!--D394D71C4BAC480EA29D9258366B079B-->
<AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
-<!--D394D71C4BAC480EA29D9258366B079B-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.ExecutionHistory]]></CLASSNAME>
+<!--D394D71C4BAC480EA29D9258366B079B-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.ExecutionHistory]]></CLASSNAME>
<!--D394D71C4BAC480EA29D9258366B079B--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--D394D71C4BAC480EA29D9258366B079B-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--D394D71C4BAC480EA29D9258366B079B--></AD_MODEL_OBJECT>
@@ -18216,7 +18216,7 @@
<!--F3DC5E0699BE45E08C4AEE07274D1034--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--F3DC5E0699BE45E08C4AEE07274D1034--> <ACTION><![CDATA[W]]></ACTION>
<!--F3DC5E0699BE45E08C4AEE07274D1034-->
<AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
-<!--F3DC5E0699BE45E08C4AEE07274D1034-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.ExecutionHistory]]></CLASSNAME>
+<!--F3DC5E0699BE45E08C4AEE07274D1034-->
<CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.ExecutionHistory]]></CLASSNAME>
<!--F3DC5E0699BE45E08C4AEE07274D1034--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--F3DC5E0699BE45E08C4AEE07274D1034-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--F3DC5E0699BE45E08C4AEE07274D1034--></AD_MODEL_OBJECT>
diff -r f1e98b6f7415 -r b5df3f5030eb
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Wed Oct 20
16:55:10 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Oct 21
04:27:28 2010 +0000
@@ -24836,7 +24836,7 @@
<!--03D2B79220404DBD9B6D744773B673D8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--03D2B79220404DBD9B6D744773B673D8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--03D2B79220404DBD9B6D744773B673D8-->
<AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--03D2B79220404DBD9B6D744773B673D8-->
<MAPPINGNAME><![CDATA[/MakePayment/Header_Edition.html]]></MAPPINGNAME>
+<!--03D2B79220404DBD9B6D744773B673D8-->
<MAPPINGNAME><![CDATA[/PaymentOut/Header_Edition.html]]></MAPPINGNAME>
<!--03D2B79220404DBD9B6D744773B673D8--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--03D2B79220404DBD9B6D744773B673D8--></AD_MODEL_OBJECT_MAPPING>
@@ -24926,7 +24926,7 @@
<!--0E2415530146445CA736D6E6617BA088--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0E2415530146445CA736D6E6617BA088--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0E2415530146445CA736D6E6617BA088-->
<AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--0E2415530146445CA736D6E6617BA088-->
<MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Relation.html]]></MAPPINGNAME>
+<!--0E2415530146445CA736D6E6617BA088-->
<MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Relation.html]]></MAPPINGNAME>
<!--0E2415530146445CA736D6E6617BA088--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--0E2415530146445CA736D6E6617BA088--></AD_MODEL_OBJECT_MAPPING>
@@ -24946,7 +24946,7 @@
<!--10A648F1A1124FF682BC350599E5D1A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--10A648F1A1124FF682BC350599E5D1A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--10A648F1A1124FF682BC350599E5D1A9-->
<AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--10A648F1A1124FF682BC350599E5D1A9-->
<MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
+<!--10A648F1A1124FF682BC350599E5D1A9-->
<MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
<!--10A648F1A1124FF682BC350599E5D1A9--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--10A648F1A1124FF682BC350599E5D1A9--></AD_MODEL_OBJECT_MAPPING>
@@ -24996,7 +24996,7 @@
<!--1632BF8A81B749C89AD3F8D5A5A28775--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1632BF8A81B749C89AD3F8D5A5A28775--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--1632BF8A81B749C89AD3F8D5A5A28775-->
<AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--1632BF8A81B749C89AD3F8D5A5A28775-->
<MAPPINGNAME><![CDATA[/MakePayment/Lines_Relation.html]]></MAPPINGNAME>
+<!--1632BF8A81B749C89AD3F8D5A5A28775-->
<MAPPINGNAME><![CDATA[/PaymentOut/Lines_Relation.html]]></MAPPINGNAME>
<!--1632BF8A81B749C89AD3F8D5A5A28775--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--1632BF8A81B749C89AD3F8D5A5A28775--></AD_MODEL_OBJECT_MAPPING>
@@ -25206,7 +25206,7 @@
<!--372196838EB64077891EE927D5DE635C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--372196838EB64077891EE927D5DE635C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--372196838EB64077891EE927D5DE635C-->
<AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--372196838EB64077891EE927D5DE635C-->
<MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Relation.html]]></MAPPINGNAME>
+<!--372196838EB64077891EE927D5DE635C-->
<MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Relation.html]]></MAPPINGNAME>
<!--372196838EB64077891EE927D5DE635C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--372196838EB64077891EE927D5DE635C--></AD_MODEL_OBJECT_MAPPING>
@@ -25216,7 +25216,7 @@
<!--391464C0820D445FB264EAB6A53BE26A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--391464C0820D445FB264EAB6A53BE26A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--391464C0820D445FB264EAB6A53BE26A-->
<AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--391464C0820D445FB264EAB6A53BE26A-->
<MAPPINGNAME><![CDATA[/MakePayment/Header_Excel.xls]]></MAPPINGNAME>
+<!--391464C0820D445FB264EAB6A53BE26A-->
<MAPPINGNAME><![CDATA[/PaymentOut/Header_Excel.xls]]></MAPPINGNAME>
<!--391464C0820D445FB264EAB6A53BE26A--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--391464C0820D445FB264EAB6A53BE26A--></AD_MODEL_OBJECT_MAPPING>
@@ -25346,7 +25346,7 @@
<!--52524C56BABF4E3784FD103DA1A0DB17--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--52524C56BABF4E3784FD103DA1A0DB17--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--52524C56BABF4E3784FD103DA1A0DB17-->
<AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--52524C56BABF4E3784FD103DA1A0DB17-->
<MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Edition.html]]></MAPPINGNAME>
+<!--52524C56BABF4E3784FD103DA1A0DB17-->
<MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Edition.html]]></MAPPINGNAME>
<!--52524C56BABF4E3784FD103DA1A0DB17--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--52524C56BABF4E3784FD103DA1A0DB17--></AD_MODEL_OBJECT_MAPPING>
@@ -26556,7 +26556,7 @@
<!--7C541AC0C752FDD7E040007F01016B4D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C541AC0C752FDD7E040007F01016B4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C541AC0C752FDD7E040007F01016B4D-->
<AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C752FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Header_Relation.html]]></MAPPINGNAME>
+<!--7C541AC0C752FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/PaymentIn/Header_Relation.html]]></MAPPINGNAME>
<!--7C541AC0C752FDD7E040007F01016B4D--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--7C541AC0C752FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
@@ -26566,7 +26566,7 @@
<!--7C541AC0C753FDD7E040007F01016B4D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C541AC0C753FDD7E040007F01016B4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C541AC0C753FDD7E040007F01016B4D-->
<AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C753FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Header_Edition.html]]></MAPPINGNAME>
+<!--7C541AC0C753FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/PaymentIn/Header_Edition.html]]></MAPPINGNAME>
<!--7C541AC0C753FDD7E040007F01016B4D--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--7C541AC0C753FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
@@ -26576,7 +26576,7 @@
<!--7C541AC0C754FDD7E040007F01016B4D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C541AC0C754FDD7E040007F01016B4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C541AC0C754FDD7E040007F01016B4D-->
<AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C754FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Header_Excel.xls]]></MAPPINGNAME>
+<!--7C541AC0C754FDD7E040007F01016B4D-->
<MAPPINGNAME><![CDATA[/PaymentIn/Header_Excel.xls]]></MAPPINGNAME>
<!--7C541AC0C754FDD7E040007F01016B4D--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--7C541AC0C754FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
@@ -26596,7 +26596,7 @@
<!--7C667247C7BD2B30E040007F01010C8C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C667247C7BD2B30E040007F01010C8C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C667247C7BD2B30E040007F01010C8C-->
<AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BD2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Relation.html]]></MAPPINGNAME>
+<!--7C667247C7BD2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/PaymentIn/Lines_Relation.html]]></MAPPINGNAME>
<!--7C667247C7BD2B30E040007F01010C8C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--7C667247C7BD2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
@@ -26606,7 +26606,7 @@
<!--7C667247C7BE2B30E040007F01010C8C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C667247C7BE2B30E040007F01010C8C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C667247C7BE2B30E040007F01010C8C-->
<AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BE2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Edition.html]]></MAPPINGNAME>
+<!--7C667247C7BE2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/PaymentIn/Lines_Edition.html]]></MAPPINGNAME>
<!--7C667247C7BE2B30E040007F01010C8C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--7C667247C7BE2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
@@ -26616,7 +26616,7 @@
<!--7C667247C7BF2B30E040007F01010C8C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7C667247C7BF2B30E040007F01010C8C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7C667247C7BF2B30E040007F01010C8C-->
<AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BF2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Excel.xls]]></MAPPINGNAME>
+<!--7C667247C7BF2B30E040007F01010C8C-->
<MAPPINGNAME><![CDATA[/PaymentIn/Lines_Excel.xls]]></MAPPINGNAME>
<!--7C667247C7BF2B30E040007F01010C8C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--7C667247C7BF2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
@@ -27266,7 +27266,7 @@
<!--9456012F208C4AAC9FC746B9C4F3429A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9456012F208C4AAC9FC746B9C4F3429A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9456012F208C4AAC9FC746B9C4F3429A-->
<AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--9456012F208C4AAC9FC746B9C4F3429A-->
<MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Edition.html]]></MAPPINGNAME>
+<!--9456012F208C4AAC9FC746B9C4F3429A-->
<MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Edition.html]]></MAPPINGNAME>
<!--9456012F208C4AAC9FC746B9C4F3429A--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--9456012F208C4AAC9FC746B9C4F3429A--></AD_MODEL_OBJECT_MAPPING>
@@ -27276,7 +27276,7 @@
<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->
<AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->
<MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
+<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->
<MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D--></AD_MODEL_OBJECT_MAPPING>
@@ -27286,7 +27286,7 @@
<!--A08189D07A2F4BE29CEECBC154133CC6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A08189D07A2F4BE29CEECBC154133CC6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A08189D07A2F4BE29CEECBC154133CC6-->
<AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--A08189D07A2F4BE29CEECBC154133CC6-->
<MAPPINGNAME><![CDATA[/MakePayment/Header_Relation.html]]></MAPPINGNAME>
+<!--A08189D07A2F4BE29CEECBC154133CC6-->
<MAPPINGNAME><![CDATA[/PaymentOut/Header_Relation.html]]></MAPPINGNAME>
<!--A08189D07A2F4BE29CEECBC154133CC6--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--A08189D07A2F4BE29CEECBC154133CC6--></AD_MODEL_OBJECT_MAPPING>
@@ -27326,7 +27326,7 @@
<!--A568643D79F8428C88ADB6AC80E04D25--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A568643D79F8428C88ADB6AC80E04D25--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A568643D79F8428C88ADB6AC80E04D25-->
<AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--A568643D79F8428C88ADB6AC80E04D25-->
<MAPPINGNAME><![CDATA[/MakePayment/Lines_Edition.html]]></MAPPINGNAME>
+<!--A568643D79F8428C88ADB6AC80E04D25-->
<MAPPINGNAME><![CDATA[/PaymentOut/Lines_Edition.html]]></MAPPINGNAME>
<!--A568643D79F8428C88ADB6AC80E04D25--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--A568643D79F8428C88ADB6AC80E04D25--></AD_MODEL_OBJECT_MAPPING>
@@ -27656,7 +27656,7 @@
<!--E7992452F83D4AEC89BD0B02ED1FE61B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--E7992452F83D4AEC89BD0B02ED1FE61B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E7992452F83D4AEC89BD0B02ED1FE61B-->
<AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--E7992452F83D4AEC89BD0B02ED1FE61B-->
<MAPPINGNAME><![CDATA[/MakePayment/Lines_Excel.xls]]></MAPPINGNAME>
+<!--E7992452F83D4AEC89BD0B02ED1FE61B-->
<MAPPINGNAME><![CDATA[/PaymentOut/Lines_Excel.xls]]></MAPPINGNAME>
<!--E7992452F83D4AEC89BD0B02ED1FE61B--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--E7992452F83D4AEC89BD0B02ED1FE61B--></AD_MODEL_OBJECT_MAPPING>
diff -r f1e98b6f7415 -r b5df3f5030eb src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Oct 20 16:55:10 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 21 04:27:28 2010 +0000
@@ -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.18452]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18598]]></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--></AD_MODULE>
diff -r f1e98b6f7415 -r b5df3f5030eb src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Oct 20 16:55:10
2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Oct 21 04:27:28
2010 +0000
@@ -1055,7 +1055,7 @@
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
