details: /erp/devel/main/rev/6b399769596e
changeset: 8204:6b399769596e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Aug 13 17:02:26 2010 +0200
summary: fixed issue 14187: Improve messages when trying to install not
allowed commercial modules
details: /erp/devel/main/rev/c1409977273e
changeset: 8205:c1409977273e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 16 10:59:33 2010 +0200
summary: fixed issue 14193: Oncreatedefault for column commercial_tier in
ad_module is illegal
Removed mandatoriness from ad_module.commercial_tier column, now when it is
first created
it takes null by default so oncreate default clause is not needed anymore
details: /erp/devel/main/rev/028ce3740f5a
changeset: 8206:028ce3740f5a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 16 13:56:50 2010 +0200
summary: fixed bug 14204: It is not possible to use as filter column Key
columns
details: /erp/devel/main/rev/9eed83e933e4
changeset: 8207:9eed83e933e4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 16 14:16:06 2010 +0200
summary: related to issue 14193: Removed NA from ad_module_install
details: /erp/devel/main/rev/121cde4dd41b
changeset: 8208:121cde4dd41b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 16 14:18:54 2010 +0200
summary: related to issue 14193: Removed NA from ad_module_install
details: /erp/devel/main/rev/f1e9b162a476
changeset: 8209:f1e9b162a476
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon Aug 16 20:12:02 2010 +0200
summary: Fixed 13882: in ValueListFilter error-msg add location (stacktrace)
in logfile
details: /erp/devel/main/rev/34f2283ba833
changeset: 8210:34f2283ba833
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon Aug 16 20:26:01 2010 +0200
summary: Fixed 14207: Remove HttpSecureAppServlet dependency from Utility
class
Remove the only user of the HttpSecureAppServlet type from the Utility class
to untangle compile-time dependencies.
details: /erp/devel/main/rev/0ceda0be723b
changeset: 8211:0ceda0be723b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Aug 17 08:39:01 2010 +0200
summary: related to issue 14193: Check tier only when updating commercial info
details: /erp/devel/main/rev/309570f33698
changeset: 8212:309570f33698
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Aug 17 13:01:54 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/4443754d9476
changeset: 8213:4443754d9476
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Aug 17 13:01:55 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-core/src/org/openbravo/base/VariablesBase.java |
3 +-
src-db/database/model/tables/AD_MODULE.xml |
6 +-
src-db/database/model/tables/AD_MODULE_INSTALL.xml |
4 +-
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml |
12 +-
src-db/database/sourcedata/AD_COLUMN.xml |
6 +-
src-db/database/sourcedata/AD_MESSAGE.xml |
24 -
src-db/database/sourcedata/AD_MODULE.xml |
5 +-
src-db/database/sourcedata/AD_REF_LIST.xml |
13 -
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
253 +++----
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java |
307 ++++-----
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html |
59 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.xml |
10 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java |
4 +-
src/org/openbravo/erpCommon/utility/Utility.java |
6 -
src/org/openbravo/reference/ui/UIReferenceUtility.java |
8 +-
15 files changed, 310 insertions(+), 410 deletions(-)
diffs (truncated from 993 to 300 lines):
diff -r 5faedaed0aaf -r 4443754d9476
src-core/src/org/openbravo/base/VariablesBase.java
--- a/src-core/src/org/openbravo/base/VariablesBase.java Mon Aug 16
10:02:04 2010 +0200
+++ b/src-core/src/org/openbravo/base/VariablesBase.java Tue Aug 17
13:01:55 2010 +0200
@@ -115,7 +115,8 @@
}
for (String input : inputs) {
if (!requestFilter.accept(input)) {
- log4j.error("Input: " + input + " not accepted by filter: " +
requestFilter);
+ log4j.error("Input: " + input + " not accepted by filter: " +
requestFilter,
+ new Throwable());
throw new ServletException("Input: " + input + " is not an accepted
input");
}
}
diff -r 5faedaed0aaf -r 4443754d9476 src-db/database/model/tables/AD_MODULE.xml
--- a/src-db/database/model/tables/AD_MODULE.xml Mon Aug 16 10:02:04
2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE.xml Tue Aug 17 13:01:55
2010 +0200
@@ -145,9 +145,9 @@
<default/>
<onCreateDefault/>
</column>
- <column name="COMMERCIAL_TIER" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
- <default><![CDATA[NA]]></default>
- <onCreateDefault><![CDATA[CASE WHEN ISCOMMERCIAL='N' THEN 'NA' ELSE
'1' END]]></onCreateDefault>
+ <column name="COMMERCIAL_TIER" primaryKey="false" required="false"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
</column>
<column name="ENABLED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
<default><![CDATA[Y]]></default>
diff -r 5faedaed0aaf -r 4443754d9476
src-db/database/model/tables/AD_MODULE_INSTALL.xml
--- a/src-db/database/model/tables/AD_MODULE_INSTALL.xml Mon Aug 16
10:02:04 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_INSTALL.xml Tue Aug 17
13:01:55 2010 +0200
@@ -145,8 +145,8 @@
<default><![CDATA[N]]></default>
<onCreateDefault><![CDATA['N']]></onCreateDefault>
</column>
- <column name="COMMERCIAL_TIER" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
- <default><![CDATA[NA]]></default>
+ <column name="COMMERCIAL_TIER" primaryKey="false" required="false"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
<onCreateDefault/>
</column>
<column name="ENABLED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
diff -r 5faedaed0aaf -r 4443754d9476
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Mon Aug 16
10:02:04 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Tue Aug 17
13:01:55 2010 +0200
@@ -31,15 +31,17 @@
END IF;
IF UPDATING THEN
+ --Check tier for commercial/free modules is correct
IF :new.IsCommercial = 'N' and :old.IsCommercial ='Y' THEN
- :new.commercial_Tier := 'NA';
+ :new.commercial_Tier := null;
+ END IF;
+
+ IF :new.IsCommercial='Y' AND :old.IsCommercial ='N' and
+ coalesce(:new.commercial_Tier,'.') NOT IN ('1','2') THEN
+ RAISE_APPLICATION_ERROR(-20000, '@AD_MODULE_TIER_CHK@');
END IF;
END IF;
- IF :new.IsCommercial='Y' AND :new.commercial_Tier NOT IN ('1','2') THEN
- RAISE_APPLICATION_ERROR(-20000, '@AD_MODULE_TIER_CHK@');
- END IF;
-
IF instr(:new.VERSION,'.') <= 0 OR instr(:new.VERSION,'.',1,2) <= 0 OR
instr(:new.VERSION,'.',1,3) > 0 THEN
RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like
x.y.z where x, y and z are integers.');
END IF;
diff -r 5faedaed0aaf -r 4443754d9476 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Aug 16 10:02:04 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 17 13:01:55 2010 +0200
@@ -305737,10 +305737,9 @@
<!--8BCFEC1D2692D1A8E040007F010135A9-->
<AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
<!--8BCFEC1D2692D1A8E040007F010135A9-->
<AD_REFERENCE_VALUE_ID><![CDATA[4452E6997DD14363AB4387B06939871A]]></AD_REFERENCE_VALUE_ID>
<!--8BCFEC1D2692D1A8E040007F010135A9-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--8BCFEC1D2692D1A8E040007F010135A9-->
<DEFAULTVALUE><![CDATA[NA]]></DEFAULTVALUE>
<!--8BCFEC1D2692D1A8E040007F010135A9--> <ISKEY><![CDATA[N]]></ISKEY>
<!--8BCFEC1D2692D1A8E040007F010135A9--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--8BCFEC1D2692D1A8E040007F010135A9-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BCFEC1D2692D1A8E040007F010135A9-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--8BCFEC1D2692D1A8E040007F010135A9-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--8BCFEC1D2692D1A8E040007F010135A9-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--8BCFEC1D2692D1A8E040007F010135A9--> <SEQNO><![CDATA[400]]></SEQNO>
@@ -305774,10 +305773,9 @@
<!--8BD0E076B9695E1BE040007F01013C3C-->
<AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
<!--8BD0E076B9695E1BE040007F01013C3C-->
<AD_REFERENCE_VALUE_ID><![CDATA[4452E6997DD14363AB4387B06939871A]]></AD_REFERENCE_VALUE_ID>
<!--8BD0E076B9695E1BE040007F01013C3C-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--8BD0E076B9695E1BE040007F01013C3C-->
<DEFAULTVALUE><![CDATA[NA]]></DEFAULTVALUE>
<!--8BD0E076B9695E1BE040007F01013C3C--> <ISKEY><![CDATA[N]]></ISKEY>
<!--8BD0E076B9695E1BE040007F01013C3C--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--8BD0E076B9695E1BE040007F01013C3C-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BD0E076B9695E1BE040007F01013C3C-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--8BD0E076B9695E1BE040007F01013C3C-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--8BD0E076B9695E1BE040007F01013C3C-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--8BD0E076B9695E1BE040007F01013C3C--> <SEQNO><![CDATA[370]]></SEQNO>
diff -r 5faedaed0aaf -r 4443754d9476 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Aug 16 10:02:04 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 17 13:01:55 2010 +0200
@@ -29590,18 +29590,6 @@
<!--04DDD225150B48C1B9A94E673BEF2ED9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--04DDD225150B48C1B9A94E673BEF2ED9--></AD_MESSAGE>
-<!--04DF3348E44948778DDB4FC98A55B141--><AD_MESSAGE>
-<!--04DF3348E44948778DDB4FC98A55B141-->
<AD_MESSAGE_ID><![CDATA[04DF3348E44948778DDB4FC98A55B141]]></AD_MESSAGE_ID>
-<!--04DF3348E44948778DDB4FC98A55B141-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--04DF3348E44948778DDB4FC98A55B141--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--04DF3348E44948778DDB4FC98A55B141--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--04DF3348E44948778DDB4FC98A55B141-->
<VALUE><![CDATA[MODULE_DEPENDS_ON_COMMERCIAL]]></VALUE>
-<!--04DF3348E44948778DDB4FC98A55B141--> <MSGTEXT><![CDATA[Module
<b>@MODULE@</b> depends on the following modules that are available in the
Central Repository only as commercial solutions. Access to commercial modules
requires activating your instance.]]></MSGTEXT>
-<!--04DF3348E44948778DDB4FC98A55B141--> <MSGTIP><![cda...@module@ is a
placeholder for dynamic text. It must be not changed.]]></MSGTIP>
-<!--04DF3348E44948778DDB4FC98A55B141--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--04DF3348E44948778DDB4FC98A55B141-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--04DF3348E44948778DDB4FC98A55B141--></AD_MESSAGE>
-
<!--04EEC6B52A7B4C2CACA1F767217FAFB7--><AD_MESSAGE>
<!--04EEC6B52A7B4C2CACA1F767217FAFB7-->
<AD_MESSAGE_ID><![CDATA[04EEC6B52A7B4C2CACA1F767217FAFB7]]></AD_MESSAGE_ID>
<!--04EEC6B52A7B4C2CACA1F767217FAFB7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30892,18 +30880,6 @@
<!--4E0404CF395D422B8B1D7A8FFA40E23F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--4E0404CF395D422B8B1D7A8FFA40E23F--></AD_MESSAGE>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--><AD_MESSAGE>
-<!--4EA297CD18574B0EA9E18006AE7F5A52-->
<AD_MESSAGE_ID><![CDATA[4EA297CD18574B0EA9E18006AE7F5A52]]></AD_MESSAGE_ID>
-<!--4EA297CD18574B0EA9E18006AE7F5A52-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4EA297CD18574B0EA9E18006AE7F5A52-->
<VALUE><![CDATA[COMMERCIAL_MODULE_DETAIL]]></VALUE>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--> <MSGTEXT><![CDATA[<b>@MODULE@</b>
minimal version required <b>@MIN_VERSION@</b> - Version recommended by the
Module Management window <b>@RECOMMENDED_VERSION@</b>.]]></MSGTEXT>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--> <MSGTIP><![cda...@module@,
@MIN_VERSION@, @RECOMMENDED_VERSION@ are place holders for dynamic text. It
must be not changed.]]></MSGTIP>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--4EA297CD18574B0EA9E18006AE7F5A52-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4EA297CD18574B0EA9E18006AE7F5A52--></AD_MESSAGE>
-
<!--4ECAA12B455F4BE497A92FC3F4C86BD6--><AD_MESSAGE>
<!--4ECAA12B455F4BE497A92FC3F4C86BD6-->
<AD_MESSAGE_ID><![CDATA[4ECAA12B455F4BE497A92FC3F4C86BD6]]></AD_MESSAGE_ID>
<!--4ECAA12B455F4BE497A92FC3F4C86BD6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5faedaed0aaf -r 4443754d9476 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Aug 16 10:02:04 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 17 13:01:55 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.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18212]]></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,9 +22,8 @@
<!--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--> <COMMERCIAL_TIER><![CDATA[NA]]></COMMERCIAL_TIER>
<!--0--></AD_MODULE>
</data>
diff -r 5faedaed0aaf -r 4443754d9476 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml Mon Aug 16 10:02:04
2010 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml Tue Aug 17 13:01:55
2010 +0200
@@ -8852,19 +8852,6 @@
<!--46B566C2C5AA4248A2D5FE1A1A6CA209-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--46B566C2C5AA4248A2D5FE1A1A6CA209--></AD_REF_LIST>
-<!--472DC62462994E1B95D3A3283EEE20A7--><AD_REF_LIST>
-<!--472DC62462994E1B95D3A3283EEE20A7-->
<AD_REF_LIST_ID><![CDATA[472DC62462994E1B95D3A3283EEE20A7]]></AD_REF_LIST_ID>
-<!--472DC62462994E1B95D3A3283EEE20A7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <VALUE><![CDATA[NA]]></VALUE>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <NAME><![CDATA[N/A]]></NAME>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <DESCRIPTION><![CDATA[Tier not
applicable (non commercial module)]]></DESCRIPTION>
-<!--472DC62462994E1B95D3A3283EEE20A7-->
<AD_REFERENCE_ID><![CDATA[4452E6997DD14363AB4387B06939871A]]></AD_REFERENCE_ID>
-<!--472DC62462994E1B95D3A3283EEE20A7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--472DC62462994E1B95D3A3283EEE20A7--> <SEQNO><![CDATA[1]]></SEQNO>
-<!--472DC62462994E1B95D3A3283EEE20A7--></AD_REF_LIST>
-
<!--49A96D77C74A44EA90AED7C50BBAFAE1--><AD_REF_LIST>
<!--49A96D77C74A44EA90AED7C50BBAFAE1-->
<AD_REF_LIST_ID><![CDATA[49A96D77C74A44EA90AED7C50BBAFAE1]]></AD_REF_LIST_ID>
<!--49A96D77C74A44EA90AED7C50BBAFAE1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 5faedaed0aaf -r 4443754d9476
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Aug 16 10:02:04
2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Aug 17 13:01:55
2010 +0200
@@ -15993,17 +15993,6 @@
<!--09B882E340B94131BEFF131264165994-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--09B882E340B94131BEFF131264165994--></AD_TEXTINTERFACES>
-<!--0A3894BBAF504395905B911218AB473E--><AD_TEXTINTERFACES>
-<!--0A3894BBAF504395905B911218AB473E-->
<AD_TEXTINTERFACES_ID><![CDATA[0A3894BBAF504395905B911218AB473E]]></AD_TEXTINTERFACES_ID>
-<!--0A3894BBAF504395905B911218AB473E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0A3894BBAF504395905B911218AB473E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0A3894BBAF504395905B911218AB473E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0A3894BBAF504395905B911218AB473E--> <TEXT><![CDATA[ to acquire a
subscription and activate your instance.]]></TEXT>
-<!--0A3894BBAF504395905B911218AB473E-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--0A3894BBAF504395905B911218AB473E--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--0A3894BBAF504395905B911218AB473E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0A3894BBAF504395905B911218AB473E--></AD_TEXTINTERFACES>
-
<!--0AB88EF426844BBDB58120DC8038851B--><AD_TEXTINTERFACES>
<!--0AB88EF426844BBDB58120DC8038851B-->
<AD_TEXTINTERFACES_ID><![CDATA[0AB88EF426844BBDB58120DC8038851B]]></AD_TEXTINTERFACES_ID>
<!--0AB88EF426844BBDB58120DC8038851B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16520,17 +16509,6 @@
<!--2F88E56E83B04A9BA4E716417B50DF99-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2F88E56E83B04A9BA4E716417B50DF99--></AD_TEXTINTERFACES>
-<!--357B158A0FE44CB68C910D56888DAD0C--><AD_TEXTINTERFACES>
-<!--357B158A0FE44CB68C910D56888DAD0C-->
<AD_TEXTINTERFACES_ID><![CDATA[357B158A0FE44CB68C910D56888DAD0C]]></AD_TEXTINTERFACES_ID>
-<!--357B158A0FE44CB68C910D56888DAD0C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--357B158A0FE44CB68C910D56888DAD0C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--357B158A0FE44CB68C910D56888DAD0C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--357B158A0FE44CB68C910D56888DAD0C--> <TEXT><![CDATA[ to acquire
modules.]]></TEXT>
-<!--357B158A0FE44CB68C910D56888DAD0C-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--357B158A0FE44CB68C910D56888DAD0C--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--357B158A0FE44CB68C910D56888DAD0C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--357B158A0FE44CB68C910D56888DAD0C--></AD_TEXTINTERFACES>
-
<!--3609345ACEC044BE9CB80F287CF5B019--><AD_TEXTINTERFACES>
<!--3609345ACEC044BE9CB80F287CF5B019-->
<AD_TEXTINTERFACES_ID><![CDATA[3609345ACEC044BE9CB80F287CF5B019]]></AD_TEXTINTERFACES_ID>
<!--3609345ACEC044BE9CB80F287CF5B019-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18720,17 +18698,6 @@
<!--64F98DD195484D38AC09459D35CF7924-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--64F98DD195484D38AC09459D35CF7924--></AD_TEXTINTERFACES>
-<!--650EBAB061AD4E85B236577D313A631E--><AD_TEXTINTERFACES>
-<!--650EBAB061AD4E85B236577D313A631E-->
<AD_TEXTINTERFACES_ID><![CDATA[650EBAB061AD4E85B236577D313A631E]]></AD_TEXTINTERFACES_ID>
-<!--650EBAB061AD4E85B236577D313A631E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--650EBAB061AD4E85B236577D313A631E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--650EBAB061AD4E85B236577D313A631E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--650EBAB061AD4E85B236577D313A631E--> <TEXT><![CDATA[Learn how]]></TEXT>
-<!--650EBAB061AD4E85B236577D313A631E-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--650EBAB061AD4E85B236577D313A631E--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--650EBAB061AD4E85B236577D313A631E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--650EBAB061AD4E85B236577D313A631E--></AD_TEXTINTERFACES>
-
<!--65505548D00711DD9127001D09C4A2FE--><AD_TEXTINTERFACES>
<!--65505548D00711DD9127001D09C4A2FE-->
<AD_TEXTINTERFACES_ID><![CDATA[65505548D00711DD9127001D09C4A2FE]]></AD_TEXTINTERFACES_ID>
<!--65505548D00711DD9127001D09C4A2FE-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20172,50 +20139,6 @@
<!--74F9FE001D3644CD918CC41E8218A508-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--74F9FE001D3644CD918CC41E8218A508--></AD_TEXTINTERFACES>
-<!--755436B125F81A5AE040007F010176A4--><AD_TEXTINTERFACES>
-<!--755436B125F81A5AE040007F010176A4-->
<AD_TEXTINTERFACES_ID><![CDATA[755436B125F81A5AE040007F010176A4]]></AD_TEXTINTERFACES_ID>
-<!--755436B125F81A5AE040007F010176A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--755436B125F81A5AE040007F010176A4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--755436B125F81A5AE040007F010176A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--755436B125F81A5AE040007F010176A4--> <TEXT><![CDATA[The following
module(s) are released under a commercial license that has expired: ]]></TEXT>
-<!--755436B125F81A5AE040007F010176A4-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--755436B125F81A5AE040007F010176A4--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--755436B125F81A5AE040007F010176A4-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--755436B125F81A5AE040007F010176A4--></AD_TEXTINTERFACES>
-
-<!--755436B125FA1A5AE040007F010176A4--><AD_TEXTINTERFACES>
-<!--755436B125FA1A5AE040007F010176A4-->
<AD_TEXTINTERFACES_ID><![CDATA[755436B125FA1A5AE040007F010176A4]]></AD_TEXTINTERFACES_ID>
-<!--755436B125FA1A5AE040007F010176A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--755436B125FA1A5AE040007F010176A4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--755436B125FA1A5AE040007F010176A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--755436B125FA1A5AE040007F010176A4--> <TEXT><![CDATA[ to renew licenses for
commercial modules.]]></TEXT>
-<!--755436B125FA1A5AE040007F010176A4-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--755436B125FA1A5AE040007F010176A4--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--755436B125FA1A5AE040007F010176A4-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--755436B125FA1A5AE040007F010176A4--></AD_TEXTINTERFACES>
-
-<!--755436B125FC1A5AE040007F010176A4--><AD_TEXTINTERFACES>
-<!--755436B125FC1A5AE040007F010176A4-->
<AD_TEXTINTERFACES_ID><![CDATA[755436B125FC1A5AE040007F010176A4]]></AD_TEXTINTERFACES_ID>
-<!--755436B125FC1A5AE040007F010176A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--755436B125FC1A5AE040007F010176A4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--755436B125FC1A5AE040007F010176A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--755436B125FC1A5AE040007F010176A4--> <TEXT><![CDATA[The following
module(s) are released under a commercial license that is not active
yet: ]]></TEXT>
-<!--755436B125FC1A5AE040007F010176A4-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--755436B125FC1A5AE040007F010176A4--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--755436B125FC1A5AE040007F010176A4-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--755436B125FC1A5AE040007F010176A4--></AD_TEXTINTERFACES>
-
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--><AD_TEXTINTERFACES>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF-->
<AD_TEXTINTERFACES_ID><![CDATA[780F84C2FD1F43C295A2F00A9E9ED4CF]]></AD_TEXTINTERFACES_ID>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--> <TEXT><![CDATA[The following
module(s) are released under a commercial license that require acquiring an
activation key before installation: ]]></TEXT>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--780F84C2FD1F43C295A2F00A9E9ED4CF--></AD_TEXTINTERFACES>
-
<!--785FFB121426450187CF1DD4C85A5FD9--><AD_TEXTINTERFACES>
<!--785FFB121426450187CF1DD4C85A5FD9-->
<AD_TEXTINTERFACES_ID><![CDATA[785FFB121426450187CF1DD4C85A5FD9]]></AD_TEXTINTERFACES_ID>
<!--785FFB121426450187CF1DD4C85A5FD9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20689,61 +20612,6 @@
<!--8884F1121ECD5F40E040007F01014076-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--8884F1121ECD5F40E040007F01014076--></AD_TEXTINTERFACES>
-<!--88B142C06A3FDF62E040007F0101269D--><AD_TEXTINTERFACES>
-<!--88B142C06A3FDF62E040007F0101269D-->
<AD_TEXTINTERFACES_ID><![CDATA[88B142C06A3FDF62E040007F0101269D]]></AD_TEXTINTERFACES_ID>
-<!--88B142C06A3FDF62E040007F0101269D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--88B142C06A3FDF62E040007F0101269D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--88B142C06A3FDF62E040007F0101269D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
