details: /erp/devel/main/rev/4b2d7400957b
changeset: 8757:4b2d7400957b
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Oct 25 13:02:59 2010 +0200
summary: [communityBranding] Product edition name is not translated on
Community Branding frame.
details: /erp/devel/main/rev/2b32c7c08974
changeset: 8758:2b32c7c08974
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Oct 25 13:14:17 2010 +0200
summary: Related to issue 14906.Fixed license name on IP_CLONED_OPS_MSG
AD_Message.
details: /erp/devel/main/rev/8fc8d404f947
changeset: 8759:8fc8d404f947
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Oct 25 13:29:54 2010 +0200
summary: [instancePurpose] Insert a dummy heartbeat log when setting the
purpose on a cloned community instance.
details: /erp/devel/main/rev/d9851f0e28db
changeset: 8760:d9851f0e28db
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Oct 25 13:37:15 2010 +0200
summary: Removed insertDummyHBLog method on InstancePurpose use instead the
same method of InstanceManagement.
details: /erp/devel/main/rev/72aeef622d26
changeset: 8761:72aeef622d26
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Oct 25 21:04:15 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 2 +-
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 5 ++++-
src/org/openbravo/erpCommon/utility/Home.java | 2 +-
web/html/en_US/StaticCommunityBranding-2.50-Comm.html | 8 ++++----
6 files changed, 13 insertions(+), 10 deletions(-)
diffs (98 lines):
diff -r e76e86a05241 -r 72aeef622d26 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Oct 25 12:47:18 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Oct 25 21:04:15 2010 +0000
@@ -30123,7 +30123,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 Subscription instance is a clone of
+<!--20008B2C36E44251BB8F715DE450633C--> <MSGTEXT><![CDATA[We have detected
that this Openbravo Professional/Basic 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
diff -r e76e86a05241 -r 72aeef622d26 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Oct 25 12:47:18 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Oct 25 21:04:15 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.18760]]></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 e76e86a05241 -r 72aeef622d26
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java Mon Oct
25 12:47:18 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java Mon Oct
25 21:04:15 2010 +0000
@@ -510,7 +510,7 @@
}
- private void insertDummyHBLog() throws ServletException {
+ static void insertDummyHBLog() throws ServletException {
HeartbeatLog hbLog = OBProvider.getInstance().get(HeartbeatLog.class);
hbLog.setClient(OBDal.getInstance().get(Client.class, "0"));
hbLog.setOrganization(OBDal.getInstance().get(Organization.class, "0"));
diff -r e76e86a05241 -r 72aeef622d26
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java
--- a/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java Mon Oct 25
12:47:18 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java Mon Oct 25
21:04:15 2010 +0000
@@ -131,10 +131,13 @@
out.close();
}
- private void savePurpose(String strPurpose) {
+ private void savePurpose(String strPurpose) throws ServletException {
SystemInformation systemInfo =
OBDal.getInstance().get(SystemInformation.class, "0");
systemInfo.setInstancePurpose(strPurpose);
OBDal.getInstance().save(systemInfo);
+ if (HeartbeatProcess.isClonedInstance()) {
+ InstanceManagement.insertDummyHBLog();
+ }
}
@Override
diff -r e76e86a05241 -r 72aeef622d26
src/org/openbravo/erpCommon/utility/Home.java
--- a/src/org/openbravo/erpCommon/utility/Home.java Mon Oct 25 12:47:18
2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/Home.java Mon Oct 25 21:04:15
2010 +0000
@@ -114,7 +114,7 @@
strVersion = OBVersion.getInstance().getMajorVersion();
strVersion += " - ";
strVersion += Utility.getListValueName("OBPSLicenseEdition",
ak.getLicenseClass().getCode(),
- OBContext.getOBContext().getLanguage().getLanguage());
+ "en_US");
strVersion += " - ";
strVersion += OBVersion.getInstance().getMP();
} finally {
diff -r e76e86a05241 -r 72aeef622d26
web/html/en_US/StaticCommunityBranding-2.50-Comm.html
--- a/web/html/en_US/StaticCommunityBranding-2.50-Comm.html Mon Oct 25
12:47:18 2010 +0200
+++ b/web/html/en_US/StaticCommunityBranding-2.50-Comm.html Mon Oct 25
21:04:15 2010 +0000
@@ -27,9 +27,9 @@
</h1>
<p style="margin-top: -8px; margin-left: 15px;">Discover the power of the
Openbravo ecosystem
- and extend your Openbravo system with modules. <a
href="http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Personalizing_Openbravo_ERP#Installing_a_module_from_the_Central_Repository";
target="_blank">These
-instructions</a> will get you started exploring the many available
modules that will save you time & money, and increase the
- power of your organization. For more information or to be put into
contact with an accredited <a
href="http://www.openbravo.com/partners/find-partners-support/";
target="_blank">Openbravo partner</a>, please <a
href="http://www.openbravo.com/form/customer/"; target="_blank">contact
us</a>.<a href="http://exchange.openbravo.com/"; target="_blank"><br>
+ and extend your Openbravo system with modules. <a
href="http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Personalizing_Openbravo_ERP#Installing_a_module_from_the_Central_Repository";
target="_blank">These
+instructions</a> will get you started exploring the many available modules
that will save you time & money and increase the
+ power of your organization. For more information or to be put into contact
with an accredited <a
href="http://www.openbravo.com/partners/find-partners-support/";
target="_blank">Openbravo partner</a>, please <a
href="http://www.openbravo.com/form/customer/"; target="_blank">contact
us</a>.<a href="http://exchange.openbravo.com/"; target="_blank"><br>
</a></p>
@@ -44,4 +44,4 @@
<a href="http://www.openbravo.com/product/erp/get-basic/";
target="_blank"><img src="StaticCommunityBranding-2.50-Comm_files/banner.png"
style="margin-left: 7px; margin-top: -30px;" border="0"></a>
</div>
-</body></html>
\ No newline at end of file
+</body></html>
------------------------------------------------------------------------------
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
