details: https://code.openbravo.com/erp/devel/pi/rev/6322a19c293f changeset: 32458:6322a19c293f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 17 11:29:39 2017 +0200 summary: fixed 36504: remove references to Basic Edition and Trial Subscription
details: https://code.openbravo.com/erp/devel/pi/rev/c9540f940af3 changeset: 32459:c9540f940af3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 17 13:02:13 2017 +0200 summary: related to issue 36504: removed support for 2.50 community branding diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 12 +- src-db/database/sourcedata/AD_ELEMENT.xml | 2 +- src-db/database/sourcedata/AD_FIELD.xml | 6 +- src-db/database/sourcedata/AD_MESSAGE.xml | 18 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 341 ++++----- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 18 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 40 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html | 11 +- src/org/openbravo/erpCommon/utility/StaticCommunityBranding.java | 18 +- web/html/en_US/StaticCommunityBranding-2.50-Basic.html | 64 - web/html/en_US/StaticCommunityBranding-2.50-Basic_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-Comm.html | 65 - web/html/en_US/StaticCommunityBranding-2.50-Comm_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-STD.html | 66 - web/html/en_US/StaticCommunityBranding-2.50-STD_files/banner.png | 0 20 files changed, 217 insertions(+), 464 deletions(-) diffs (truncated from 1205 to 300 lines): diff -r a9f32d3139f2 -r c9540f940af3 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jul 17 13:02:13 2017 +0200 @@ -2872,7 +2872,7 @@ <!--FF80808130D5DD6A0130D5EEF54A000A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808130D5DD6A0130D5EEF54A000A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808130D5DD6A0130D5EEF54A000A--> <VALUE><![CDATA[OBUIAPP_GAinCommunity]]></VALUE> -<!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTEXT><![CDATA[Only Professional and Basic Edition subscribers can restrict access to modules in %0 maturity status.<br/> +<!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTEXT><![CDATA[Only Professional and Enterprise Edition subscribers can restrict access to modules in %0 maturity status.<br/> <a href="http://wiki.openbravo.com/wiki/Modules_Management#Learn_why"; class="OBNoteListGridDelete" target="_blank">Learn why</a>.]]></MSGTEXT> <!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTYPE><![CDATA[W]]></MSGTYPE> <!--FF80808130D5DD6A0130D5EEF54A000A--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> @@ -2885,7 +2885,7 @@ <!--FF80808130DC55FE0130DC9631A60019--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808130DC55FE0130DC9631A60019--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808130DC55FE0130DC9631A60019--> <VALUE><![CDATA[OBUIAPP_ActivateMessage]]></VALUE> -<!--FF80808130DC55FE0130DC9631A60019--> <MSGTEXT><![CDATA[%0 only available for Professional and Basic Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/";>Learn more</a> about the benefits of Openbravo's Professional and Basic Editions.]]></MSGTEXT> +<!--FF80808130DC55FE0130DC9631A60019--> <MSGTEXT><![CDATA[%0 only available for Professional and Enterprise Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/";>Learn more</a> about the benefits of Openbravo's Professional and Enterprise Editions.]]></MSGTEXT> <!--FF80808130DC55FE0130DC9631A60019--> <MSGTIP><![CDATA[%0 is a place-holder used to show a feature description]]></MSGTIP> <!--FF80808130DC55FE0130DC9631A60019--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF80808130DC55FE0130DC9631A60019--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> diff -r a9f32d3139f2 -r c9540f940af3 modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Mon Jul 17 13:02:13 2017 +0200 @@ -165,7 +165,7 @@ <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> -<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Basic or Professional Edition]]></AUTHOR_MSG> +<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Professional or Enterprise Edition]]></AUTHOR_MSG> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_URL><![CDATA[http://www.openbravo.com/product/erp/]]></AUTHOR_URL> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--862EEC18D6FC4FA68E7867E3CF337CC7--></OBKMO_WIDGET_CLASS> diff -r a9f32d3139f2 -r c9540f940af3 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 17 13:02:13 2017 +0200 @@ -296843,7 +296843,7 @@ <!--7079E2FD4AA7799EE040007F010104AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--7079E2FD4AA7799EE040007F010104AD--> <NAME><![CDATA[Commercial]]></NAME> <!--7079E2FD4AA7799EE040007F010104AD--> <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION> -<!--7079E2FD4AA7799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. +<!--7079E2FD4AA7799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. Commercial modules can have a fee to be payed before they can be installed.]]></HELP> <!--7079E2FD4AA7799EE040007F010104AD--> <COLUMNNAME><![CDATA[IsCommercial]]></COLUMNNAME> <!--7079E2FD4AA7799EE040007F010104AD--> <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID> @@ -324452,7 +324452,7 @@ <!--89C6C4F0065443B383FF5F11C923AA1B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89C6C4F0065443B383FF5F11C923AA1B--> <NAME><![CDATA[IsCommercial]]></NAME> <!--89C6C4F0065443B383FF5F11C923AA1B--> <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION> -<!--89C6C4F0065443B383FF5F11C923AA1B--> <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. +<!--89C6C4F0065443B383FF5F11C923AA1B--> <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. Commercial modules can have a fee to be payed before they can be installed.]]></HELP> <!--89C6C4F0065443B383FF5F11C923AA1B--> <COLUMNNAME><![CDATA[Iscommercial]]></COLUMNNAME> <!--89C6C4F0065443B383FF5F11C923AA1B--> <AD_TABLE_ID><![CDATA[8FD3DEA921D74CAFB5D4296A0375E958]]></AD_TABLE_ID> @@ -325579,7 +325579,7 @@ <!--8BCFEC1D2692D1A8E040007F010135A9--> <AD_COLUMN_ID><![CDATA[8BCFEC1D2692D1A8E040007F010135A9]]></AD_COLUMN_ID> <!--8BCFEC1D2692D1A8E040007F010135A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8BCFEC1D2692D1A8E040007F010135A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--8BCFEC1D2692D1A8E040007F010135A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8BCFEC1D2692D1A8E040007F010135A9--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--8BCFEC1D2692D1A8E040007F010135A9--> <NAME><![CDATA[Tier]]></NAME> <!--8BCFEC1D2692D1A8E040007F010135A9--> <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION> <!--8BCFEC1D2692D1A8E040007F010135A9--> <HELP><![CDATA[Commercial modules are defined in different tiers: @@ -325603,7 +325603,7 @@ <!--8BCFEC1D2692D1A8E040007F010135A9--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--8BCFEC1D2692D1A8E040007F010135A9--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--8BCFEC1D2692D1A8E040007F010135A9--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> -<!--8BCFEC1D2692D1A8E040007F010135A9--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--8BCFEC1D2692D1A8E040007F010135A9--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS> <!--8BCFEC1D2692D1A8E040007F010135A9--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--8BCFEC1D2692D1A8E040007F010135A9--> <POSITION><![CDATA[37]]></POSITION> <!--8BCFEC1D2692D1A8E040007F010135A9--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> @@ -370074,7 +370074,7 @@ <!--DA765BB9E57446E38A71F6085AD52DB8--> <AD_COLUMN_ID><![CDATA[DA765BB9E57446E38A71F6085AD52DB8]]></AD_COLUMN_ID> <!--DA765BB9E57446E38A71F6085AD52DB8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--DA765BB9E57446E38A71F6085AD52DB8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--DA765BB9E57446E38A71F6085AD52DB8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--DA765BB9E57446E38A71F6085AD52DB8--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--DA765BB9E57446E38A71F6085AD52DB8--> <NAME><![CDATA[Free for Trial]]></NAME> <!--DA765BB9E57446E38A71F6085AD52DB8--> <COLUMNNAME><![CDATA[Istrialallowed]]></COLUMNNAME> <!--DA765BB9E57446E38A71F6085AD52DB8--> <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID> @@ -370094,7 +370094,7 @@ <!--DA765BB9E57446E38A71F6085AD52DB8--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--DA765BB9E57446E38A71F6085AD52DB8--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--DA765BB9E57446E38A71F6085AD52DB8--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> -<!--DA765BB9E57446E38A71F6085AD52DB8--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--DA765BB9E57446E38A71F6085AD52DB8--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS> <!--DA765BB9E57446E38A71F6085AD52DB8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--DA765BB9E57446E38A71F6085AD52DB8--> <POSITION><![CDATA[41]]></POSITION> <!--DA765BB9E57446E38A71F6085AD52DB8--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> diff -r a9f32d3139f2 -r c9540f940af3 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jul 17 13:02:13 2017 +0200 @@ -27058,7 +27058,7 @@ <!--7079E2FD4AA8799EE040007F010104AD--> <NAME><![CDATA[Commercial]]></NAME> <!--7079E2FD4AA8799EE040007F010104AD--> <PRINTNAME><![CDATA[Commercial]]></PRINTNAME> <!--7079E2FD4AA8799EE040007F010104AD--> <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION> -<!--7079E2FD4AA8799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. +<!--7079E2FD4AA8799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. Commercial modules can have a fee to be payed before they can be installed.]]></HELP> <!--7079E2FD4AA8799EE040007F010104AD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--7079E2FD4AA8799EE040007F010104AD--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> diff -r a9f32d3139f2 -r c9540f940af3 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 17 13:02:13 2017 +0200 @@ -202420,7 +202420,7 @@ <!--3A94F4D1511B4F6DBC07505B51046BF9--> <AD_FIELD_ID><![CDATA[3A94F4D1511B4F6DBC07505B51046BF9]]></AD_FIELD_ID> <!--3A94F4D1511B4F6DBC07505B51046BF9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--3A94F4D1511B4F6DBC07505B51046BF9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--3A94F4D1511B4F6DBC07505B51046BF9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3A94F4D1511B4F6DBC07505B51046BF9--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--3A94F4D1511B4F6DBC07505B51046BF9--> <NAME><![CDATA[Free for Trial]]></NAME> <!--3A94F4D1511B4F6DBC07505B51046BF9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--3A94F4D1511B4F6DBC07505B51046BF9--> <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID> @@ -233848,7 +233848,7 @@ <!--7079E2FD4AA9799EE040007F010104AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--7079E2FD4AA9799EE040007F010104AD--> <NAME><![CDATA[Commercial]]></NAME> <!--7079E2FD4AA9799EE040007F010104AD--> <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION> -<!--7079E2FD4AA9799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. +<!--7079E2FD4AA9799EE040007F010104AD--> <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances. Commercial modules can have a fee to be payed before they can be installed.]]></HELP> <!--7079E2FD4AA9799EE040007F010104AD--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--7079E2FD4AA9799EE040007F010104AD--> <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID> @@ -253656,7 +253656,7 @@ <!--8BD10BA993814495E040007F010135AB--> <AD_FIELD_ID><![CDATA[8BD10BA993814495E040007F010135AB]]></AD_FIELD_ID> <!--8BD10BA993814495E040007F010135AB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8BD10BA993814495E040007F010135AB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--8BD10BA993814495E040007F010135AB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8BD10BA993814495E040007F010135AB--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--8BD10BA993814495E040007F010135AB--> <NAME><![CDATA[Tier]]></NAME> <!--8BD10BA993814495E040007F010135AB--> <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION> <!--8BD10BA993814495E040007F010135AB--> <HELP><![CDATA[Commercial modules are defined in different tiers: diff -r a9f32d3139f2 -r c9540f940af3 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jul 17 13:02:13 2017 +0200 @@ -16336,7 +16336,7 @@ <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <VALUE><![CDATA[OBPSAnyEdition]]></VALUE> -<!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <MSGTEXT><![CDATA[Professional or Basic Edition]]></MSGTEXT> +<!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <MSGTEXT><![CDATA[Professional or Enterprise Edition]]></MSGTEXT> <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--0FC7B0C6F4FC4F04BEAD06F30E895516--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -17324,7 +17324,7 @@ <!--20008B2C36E44251BB8F715DE450633C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--20008B2C36E44251BB8F715DE450633C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--20008B2C36E44251BB8F715DE450633C--> <VALUE><![CDATA[IP_CLONED_OPS_MSG]]></VALUE> -<!--20008B2C36E44251BB8F715DE450633C--> <MSGTEXT><![CDATA[We have detected that this Openbravo Professional/Basic Edition instance is a clone of +<!--20008B2C36E44251BB8F715DE450633C--> <MSGTEXT><![CDATA[We have detected that this Openbravo Professional/Enterprise Edition instance is a clone of another one. You need to go to the Instance Activation window to reactivate the clone. Here you will set @@ -18529,7 +18529,7 @@ <!--368B60C0A224458D8A388F911BD26785--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--368B60C0A224458D8A388F911BD26785--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--368B60C0A224458D8A388F911BD26785--> <VALUE><![CDATA[OBPS_EXPIRED_TRIAL]]></VALUE> -<!--368B60C0A224458D8A388F911BD26785--> <MSGTEXT><![CDATA[This instance is registered with a Trial license for Evaluation. This license has expired. Now only System Administrators can login the system to switch to a Basic or Professional subscription or to deactivate the subscription, via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation"; target="_blank">Learn more</a>]]></MSGTEXT> +<!--368B60C0A224458D8A388F911BD26785--> <MSGTEXT><![CDATA[This instance is registered with a Trial license for Evaluation. This license has expired. Now only System Administrators can login the system to switch to a Enterprise or Professional subscription or to deactivate the subscription, via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation"; target="_blank">Learn more</a>]]></MSGTEXT> <!--368B60C0A224458D8A388F911BD26785--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--368B60C0A224458D8A388F911BD26785--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--368B60C0A224458D8A388F911BD26785--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -22955,7 +22955,7 @@ <!--9124D4EE7DE048D2A19201A1E779B9A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9124D4EE7DE048D2A19201A1E779B9A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9124D4EE7DE048D2A19201A1E779B9A7--> <VALUE><![CDATA[OBPS_TO_EXPIRE_TRIAL]]></VALUE> -<!--9124D4EE7DE048D2A19201A1E779B9A7--> <MSGTEXT><![CDATA[This instance is registered with a Trial License for Evaluation. This Trial License will expire in @days@ days, before it expires you should buy a a Basic or Professional Subscription and activate it via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation"; target="_blank">Learn more</a>]]></MSGTEXT> +<!--9124D4EE7DE048D2A19201A1E779B9A7--> <MSGTEXT><![CDATA[This instance is registered with a Trial License for Evaluation. This Trial License will expire in @days@ days, before it expires you should buy a Enterprise or Professional Subscription and activate it via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation"; target="_blank">Learn more</a>]]></MSGTEXT> <!--9124D4EE7DE048D2A19201A1E779B9A7--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--9124D4EE7DE048D2A19201A1E779B9A7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--9124D4EE7DE048D2A19201A1E779B9A7--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -23761,7 +23761,7 @@ <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <VALUE><![CDATA[CannotDeactivateWithCommercialModules]]></VALUE> -<!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <MSGTEXT><![CDATA[You cannot deactivate your Professional/Basic Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT> +<!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <MSGTEXT><![CDATA[You cannot deactivate your Professional/Enterprise Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT> <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--A29E0EA08B7B49B6A89722E6DD67A4EE--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -25326,7 +25326,7 @@ <!--C3172067BB244F8693A584A9FAFBEE38--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C3172067BB244F8693A584A9FAFBEE38--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C3172067BB244F8693A584A9FAFBEE38--> <VALUE><![CDATA[OPSNotActiveTill]]></VALUE> -<!--C3172067BB244F8693A584A9FAFBEE38--> <MSGTEXT><![CDATA[Your Professional/Basic Edition will not be active until ]]></MSGTEXT> +<!--C3172067BB244F8693A584A9FAFBEE38--> <MSGTEXT><![CDATA[Your Professional/Enterprise Edition will not be active until ]]></MSGTEXT> <!--C3172067BB244F8693A584A9FAFBEE38--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--C3172067BB244F8693A584A9FAFBEE38--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C3172067BB244F8693A584A9FAFBEE38--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -25604,7 +25604,7 @@ <!--C8433C64354D44C6A76F2A09CAF85907--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C8433C64354D44C6A76F2A09CAF85907--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C8433C64354D44C6A76F2A09CAF85907--> <VALUE><![CDATA[OBPSNeededForAudit]]></VALUE> -<!--C8433C64354D44C6A76F2A09CAF85907--> <MSGTEXT><![CDATA[Openbravo Professional/Basic Edition is needed in order to be able to keep track of audit.]]></MSGTEXT> +<!--C8433C64354D44C6A76F2A09CAF85907--> <MSGTEXT><![CDATA[Openbravo Professional/Enterprise Edition is needed in order to be able to keep track of audit.]]></MSGTEXT> <!--C8433C64354D44C6A76F2A09CAF85907--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--C8433C64354D44C6A76F2A09CAF85907--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C8433C64354D44C6A76F2A09CAF85907--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -27013,7 +27013,7 @@ <!--E3EBB7F6B97348EAA669732392EEF310--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--E3EBB7F6B97348EAA669732392EEF310--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E3EBB7F6B97348EAA669732392EEF310--> <VALUE><![CDATA[OPSActivationExpired]]></VALUE> -<!--E3EBB7F6B97348EAA669732392EEF310--> <MSGTEXT><![CDATA[Your Professional/Basic Edition expired on ]]></MSGTEXT> +<!--E3EBB7F6B97348EAA669732392EEF310--> <MSGTEXT><![CDATA[Your Professional/Enterprise Edition expired on ]]></MSGTEXT> <!--E3EBB7F6B97348EAA669732392EEF310--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--E3EBB7F6B97348EAA669732392EEF310--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--E3EBB7F6B97348EAA669732392EEF310--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> @@ -28106,7 +28106,7 @@ <!--FBD240BC51C8471F85D65EFB40E079B6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FBD240BC51C8471F85D65EFB40E079B6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FBD240BC51C8471F85D65EFB40E079B6--> <VALUE><![CDATA[OBPS_SUBSCRIPTION_REQUIRED]]></VALUE> -<!--FBD240BC51C8471F85D65EFB40E079B6--> <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional or Basic Edition: <b>@MODULE_LIST@</b>]]></MSGTEXT> +<!--FBD240BC51C8471F85D65EFB40E079B6--> <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional or Enterprise Edition: <b>@MODULE_LIST@</b>]]></MSGTEXT> <!--FBD240BC51C8471F85D65EFB40E079B6--> <MSGTIP><![CDATA[@MODULE_LIST@ is a place holder for a list of modules. It must be not changed.]]></MSGTIP> <!--FBD240BC51C8471F85D65EFB40E079B6--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FBD240BC51C8471F85D65EFB40E079B6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> diff -r a9f32d3139f2 -r c9540f940af3 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Jul 17 08:18:09 2017 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Jul 17 13:02:13 2017 +0200 @@ -12340,6 +12340,17 @@ <!--01CB59466E62429AA71D1FF4EE80FE8C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--01CB59466E62429AA71D1FF4EE80FE8C--></AD_TEXTINTERFACES> +<!--023982B9A70C450DA2F5A9C8A8112574--><AD_TEXTINTERFACES> +<!--023982B9A70C450DA2F5A9C8A8112574--> <AD_TEXTINTERFACES_ID><![CDATA[023982B9A70C450DA2F5A9C8A8112574]]></AD_TEXTINTERFACES_ID> +<!--023982B9A70C450DA2F5A9C8A8112574--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--023982B9A70C450DA2F5A9C8A8112574--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--023982B9A70C450DA2F5A9C8A8112574--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--023982B9A70C450DA2F5A9C8A8112574--> <TEXT><![CDATA[Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional/Enterprise Edition.]]></TEXT> +<!--023982B9A70C450DA2F5A9C8A8112574--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html]]></FILENAME> +<!--023982B9A70C450DA2F5A9C8A8112574--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--023982B9A70C450DA2F5A9C8A8112574--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--023982B9A70C450DA2F5A9C8A8112574--></AD_TEXTINTERFACES> + <!--023D343FA6294F3B9B0F8B1CA57712FB--><AD_TEXTINTERFACES> <!--023D343FA6294F3B9B0F8B1CA57712FB--> <AD_TEXTINTERFACES_ID><![CDATA[023D343FA6294F3B9B0F8B1CA57712FB]]></AD_TEXTINTERFACES_ID> <!--023D343FA6294F3B9B0F8B1CA57712FB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -13077,6 +13088,17 @@ <!--1AAE3A265FF94E2094B04B0C9C3F521E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1AAE3A265FF94E2094B04B0C9C3F521E--></AD_TEXTINTERFACES> +<!--1B0061459D234054B9012D342E613EAE--><AD_TEXTINTERFACES> +<!--1B0061459D234054B9012D342E613EAE--> <AD_TEXTINTERFACES_ID><![CDATA[1B0061459D234054B9012D342E613EAE]]></AD_TEXTINTERFACES_ID> +<!--1B0061459D234054B9012D342E613EAE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1B0061459D234054B9012D342E613EAE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1B0061459D234054B9012D342E613EAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1B0061459D234054B9012D342E613EAE--> <TEXT><![CDATA[To reactivate an expired Professional or Enterprise Edition, you need to refresh your Activation File.]]></TEXT> +<!--1B0061459D234054B9012D342E613EAE--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME> +<!--1B0061459D234054B9012D342E613EAE--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--1B0061459D234054B9012D342E613EAE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--1B0061459D234054B9012D342E613EAE--></AD_TEXTINTERFACES> + <!--1B14E1743A3D46C29DE783279D03259E--><AD_TEXTINTERFACES> <!--1B14E1743A3D46C29DE783279D03259E--> <AD_TEXTINTERFACES_ID><![CDATA[1B14E1743A3D46C29DE783279D03259E]]></AD_TEXTINTERFACES_ID> <!--1B14E1743A3D46C29DE783279D03259E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -13879,6 +13901,17 @@ <!--305C9A63368F4A23824C08B58050006B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--305C9A63368F4A23824C08B58050006B--></AD_TEXTINTERFACES> +<!--30AF72F71DFD42879F6DB5C83C92B80D--><AD_TEXTINTERFACES> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <AD_TEXTINTERFACES_ID><![CDATA[30AF72F71DFD42879F6DB5C83C92B80D]]></AD_TEXTINTERFACES_ID> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <TEXT><![CDATA[You need to renew the system’s Openbravo Professional/Enterprise Edition subscription. Users will not be able to login, until you do so.]]></TEXT> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--30AF72F71DFD42879F6DB5C83C92B80D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--30AF72F71DFD42879F6DB5C83C92B80D--></AD_TEXTINTERFACES> + <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA--><AD_TEXTINTERFACES> <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA--> <AD_TEXTINTERFACES_ID><![CDATA[30E7BBBB26E54ABBBA0BFFFF6C3BB4FA]]></AD_TEXTINTERFACES_ID> <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -14275,6 +14308,17 @@ <!--3EC2EB86330611DEB65F3B051E6B5876--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--3EC2EB86330611DEB65F3B051E6B5876--></AD_TEXTINTERFACES> +<!--3EF733B542E643C687677EC5718E2994--><AD_TEXTINTERFACES> +<!--3EF733B542E643C687677EC5718E2994--> <AD_TEXTINTERFACES_ID><![CDATA[3EF733B542E643C687677EC5718E2994]]></AD_TEXTINTERFACES_ID> +<!--3EF733B542E643C687677EC5718E2994--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3EF733B542E643C687677EC5718E2994--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3EF733B542E643C687677EC5718E2994--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3EF733B542E643C687677EC5718E2994--> <TEXT><![CDATA[Learn more about Openbravo Professional/Enterprise Edition subscription options]]></TEXT> +<!--3EF733B542E643C687677EC5718E2994--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME> +<!--3EF733B542E643C687677EC5718E2994--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--3EF733B542E643C687677EC5718E2994--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3EF733B542E643C687677EC5718E2994--></AD_TEXTINTERFACES> + <!--3F1024E0A08D47CDA648DAE42FC3DBE3--><AD_TEXTINTERFACES> <!--3F1024E0A08D47CDA648DAE42FC3DBE3--> <AD_TEXTINTERFACES_ID><![CDATA[3F1024E0A08D47CDA648DAE42FC3DBE3]]></AD_TEXTINTERFACES_ID> <!--3F1024E0A08D47CDA648DAE42FC3DBE3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -14319,6 +14363,17 @@ <!--413F936C37AA4E0D865BD0109ECAE092--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--413F936C37AA4E0D865BD0109ECAE092--></AD_TEXTINTERFACES> +<!--417D3E6C5D974E598485F0F5F321A70E--><AD_TEXTINTERFACES> +<!--417D3E6C5D974E598485F0F5F321A70E--> <AD_TEXTINTERFACES_ID><![CDATA[417D3E6C5D974E598485F0F5F321A70E]]></AD_TEXTINTERFACES_ID> +<!--417D3E6C5D974E598485F0F5F321A70E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--417D3E6C5D974E598485F0F5F321A70E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--417D3E6C5D974E598485F0F5F321A70E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
