details: /erp/devel/main/rev/40d69c79f811
changeset: 7985:40d69c79f811
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Jul 28 18:39:33 2010 +0530
summary: Fixes Issue 13967: field \"script\" is ignored in process \"import
file loader\".
details: /erp/devel/main/rev/f5ab5102175e
changeset: 7986:f5ab5102175e
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Jul 29 11:33:51 2010 +0530
summary: Fixes Issue 13954: The URL field does not work properly.
details: /erp/devel/main/rev/32653bcd1837
changeset: 7987:32653bcd1837
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Jul 29 10:29:47 2010 +0200
summary: Fixed issue 14073. Data changes will now be sorted before being
applied.
details: /erp/devel/main/rev/08293c2a9698
changeset: 7988:08293c2a9698
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jul 29 16:14:30 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/9e1bb4f5ae0b
changeset: 7989:9e1bb4f5ae0b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jul 29 16:14:30 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
.hgsigs | 1 +
.hgtags | 1 +
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/sourcedata/AD_FIELD.xml | 2 +-
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
web/js/default/UrlTextBox.js | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)
diffs (63 lines):
diff -r acce63739f67 -r 9e1bb4f5ae0b .hgsigs
--- a/.hgsigs Wed Jul 28 10:37:35 2010 +0530
+++ b/.hgsigs Thu Jul 29 16:14:30 2010 +0200
@@ -20,3 +20,4 @@
9f343a616b2f998c3867661467de5dd9daeb7112 0
iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
9b4bbe8362f54f7212653fddf5bd053183a7ffda 0
iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw
7fe932c5c015da84a972d6945dd0451366bbf325 0
iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt
+618363224a381737439e0bd4461e2d36c4fd986e 0
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
diff -r acce63739f67 -r 9e1bb4f5ae0b .hgtags
--- a/.hgtags Wed Jul 28 10:37:35 2010 +0530
+++ b/.hgtags Thu Jul 29 16:14:30 2010 +0200
@@ -30,3 +30,4 @@
41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18
34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
+99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
diff -r acce63739f67 -r 9e1bb4f5ae0b src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r acce63739f67 -r 9e1bb4f5ae0b src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Jul 28 10:37:35 2010 +0530
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Jul 29 16:14:30 2010 +0200
@@ -63415,7 +63415,7 @@
<!--5324--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--5324--> <AD_TAB_ID><![CDATA[316]]></AD_TAB_ID>
<!--5324--> <AD_COLUMN_ID><![CDATA[6650]]></AD_COLUMN_ID>
-<!--5324--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5324--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--5324--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
<!--5324--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--5324--> <SEQNO><![CDATA[170]]></SEQNO>
diff -r acce63739f67 -r 9e1bb4f5ae0b src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Jul 28 10:37:35 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Thu Jul 29 16:14:30 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.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17988]]></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 acce63739f67 -r 9e1bb4f5ae0b web/js/default/UrlTextBox.js
--- a/web/js/default/UrlTextBox.js Wed Jul 28 10:37:35 2010 +0530
+++ b/web/js/default/UrlTextBox.js Thu Jul 29 16:14:30 2010 +0200
@@ -45,7 +45,7 @@
isValidUrl = function(/*String*/str_url) {
if (str_url.length == 0) return true;
// url parsing and formatting routimes. modify them if you wish other url
format
- var re_date =
/^([http|ftp])+\:\/\/(([A-Za-z0-9]+)(\.)?)+((\/)([A-Za-z0-9]*(\.)?[A-Za-z0-9]*))*$/;
+ var re_date =
/^([http|ftp])+\:\/\/(([A-Za-z0-9]+)(\.)?(\-)?)+((\/)([A-Za-z0-9\-\_]*(\.)?[A-Za-z0-9\-\_]*))*$/;
if (!re_date.exec(str_url))
return false;
return (true);
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
