details: /erp/devel/int/rev/2e60729b9c13
changeset: 6544:2e60729b9c13
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Mar 02 12:23:55 2010 +0100
summary: Fixes issue 0012014: Error in Project Profitability
details: /erp/devel/int/rev/27d9578201da
changeset: 6545:27d9578201da
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Mar 02 12:49:24 2010 +0100
summary: Fixes issue 0012014: Error in Project Profitability
details: /erp/devel/int/rev/5621f3cd9f4b
changeset: 6546:5621f3cd9f4b
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Mar 02 13:52:37 2010 +0100
summary: Issue 12515: Avoid errors from mod-triggers by setting core in
development
As all testcases rollback the transaction at the end no change done to db data
details: /erp/devel/int/rev/61af0928920b
changeset: 6547:61af0928920b
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Mar 02 14:37:05 2010 +0100
summary: Fixed issue 12040: Now all MessageBoxes have the same ID
details: /erp/devel/int/rev/b56fd08a6a38
changeset: 6548:b56fd08a6a38
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Mar 02 15:02:02 2010 +0100
summary: Issue 12515: add new junit test to the *AntTaskTest-suites
details: /erp/devel/int/rev/fa8455a993b4
changeset: 6549:fa8455a993b4
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Mar 02 15:06:42 2010 +0100
summary: Fixed issue 11589: Added IDs to InstanceManagement.html
details: /erp/devel/int/rev/ba4cbeb3d8a7
changeset: 6550:ba4cbeb3d8a7
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Mar 02 17:01:15 2010 +0100
summary: fixed bug 11916: You can select a Warehouse that does not belong to
your organization
details: /erp/devel/int/rev/2517f0ee895c
changeset: 6551:2517f0ee895c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Mar 02 17:20:22 2010 +0100
summary: fixed bug 12528: Hearbeat activation fails: ComplexityRate
details: /erp/devel/int/rev/e8ac46d4297c
changeset: 6552:e8ac46d4297c
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Mar 02 18:47:40 2010 +0100
summary: Fixed 12529: Make order of columnnames in error message stable
details: /erp/devel/int/rev/f58ffdba8c78
changeset: 6553:f58ffdba8c78
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Mar 02 20:19:03 2010 +0100
summary: Fixed issue 12327 and 12333: Now Login_F1 messages are messageBD
details: /erp/devel/int/rev/ad2e6b14c421
changeset: 6554:ad2e6b14c421
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Mar 02 20:31:01 2010 +0100
summary: Fixed typo
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 44
+++++-----
src-db/database/sourcedata/AD_MESSAGE.xml | 33
+++++++
src-test/org/openbravo/test/AllAntTaskTests.java | 2 +
src-test/org/openbravo/test/AllQuickAntTaskTests.java | 2 +
src-test/org/openbravo/test/AntTaskTests.java | 2 +
src-test/org/openbravo/test/system/ErrorTextParserTest.java | 9
+-
src-wad/src/org/openbravo/wad/Wad.java | 22
++--
src/org/openbravo/base/secureApp/Advise.html | 4
+-
src/org/openbravo/base/secureApp/Advise.xml | 4
+-
src/org/openbravo/base/secureApp/AdvisePopUp.html | 6
+-
src/org/openbravo/base/secureApp/AdvisePopUp.xml | 5
+-
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html | 8
+-
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.xml | 5
+-
src/org/openbravo/base/secureApp/Error.html | 4
+-
src/org/openbravo/base/secureApp/Error.xml | 4
+-
src/org/openbravo/base/secureApp/ErrorPopUp.html | 6
+-
src/org/openbravo/base/secureApp/ErrorPopUp.xml | 5
+-
src/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.html | 6
+-
src/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.xml | 4
+-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 19
+--
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 5 +
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 2
+-
src/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.html | 6
+-
src/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.xml | 4
+-
src/org/openbravo/erpCommon/security/Login.java | 42
+++++++-
src/org/openbravo/erpCommon/security/Login_F1.html | 8
+-
src/org/openbravo/erpCommon/security/Login_F1.xml | 10
+-
src/org/openbravo/erpCommon/utility/ErrorTextParserORACLE.java | 5 +
src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java | 5 +
src/org/openbravo/erpCommon/utility/SystemInfo.java | 2
+-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintStatus.html | 8
+-
src/org/openbravo/test/system/ErrorTextParserTest_data.xsql | 6 +
web/js/utils.js | 2
+-
33 files changed, 197 insertions(+), 102 deletions(-)
diffs (truncated from 838 to 300 lines):
diff -r fda935b731fe -r ad2e6b14c421 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 01 22:20:45 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Mar 02 20:31:01 2010 +0100
@@ -182302,6 +182302,28 @@
<!--26291BB6BF9F11DD9334001B388C61A4-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--26291BB6BF9F11DD9334001B388C61A4--></AD_FIELD>
+<!--280BB3827CDC4C34AC53167B360BF850--><AD_FIELD>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_FIELD_ID><![CDATA[280BB3827CDC4C34AC53167B360BF850]]></AD_FIELD_ID>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--280BB3827CDC4C34AC53167B360BF850--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--280BB3827CDC4C34AC53167B360BF850--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--280BB3827CDC4C34AC53167B360BF850--> <NAME><![CDATA[Service Cost]]></NAME>
+<!--280BB3827CDC4C34AC53167B360BF850--> <HELP><![CDATA[Expected cost of
services provided. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--280BB3827CDC4C34AC53167B360BF850--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_COLUMN_ID><![CDATA[DDD1D5A0F25942B8B2C5D1DDF78AE9CD]]></AD_COLUMN_ID>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--280BB3827CDC4C34AC53167B360BF850--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--280BB3827CDC4C34AC53167B360BF850--> <SEQNO><![CDATA[360]]></SEQNO>
+<!--280BB3827CDC4C34AC53167B360BF850--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--280BB3827CDC4C34AC53167B360BF850--></AD_FIELD>
+
<!--2828AC0401C54F0FBE5B4E8CFC799B76--><AD_FIELD>
<!--2828AC0401C54F0FBE5B4E8CFC799B76-->
<AD_FIELD_ID><![CDATA[2828AC0401C54F0FBE5B4E8CFC799B76]]></AD_FIELD_ID>
<!--2828AC0401C54F0FBE5B4E8CFC799B76-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -182326,28 +182348,6 @@
<!--2828AC0401C54F0FBE5B4E8CFC799B76-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2828AC0401C54F0FBE5B4E8CFC799B76--></AD_FIELD>
-<!--280BB3827CDC4C34AC53167B360BF850--><AD_FIELD>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_FIELD_ID><![CDATA[280BB3827CDC4C34AC53167B360BF850]]></AD_FIELD_ID>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--280BB3827CDC4C34AC53167B360BF850--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--280BB3827CDC4C34AC53167B360BF850--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--280BB3827CDC4C34AC53167B360BF850--> <NAME><![CDATA[Service Cost]]></NAME>
-<!--280BB3827CDC4C34AC53167B360BF850--> <HELP><![CDATA[Expected cost of
services provided. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--280BB3827CDC4C34AC53167B360BF850--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_COLUMN_ID><![CDATA[DDD1D5A0F25942B8B2C5D1DDF78AE9CD]]></AD_COLUMN_ID>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--280BB3827CDC4C34AC53167B360BF850--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--280BB3827CDC4C34AC53167B360BF850--> <SEQNO><![CDATA[360]]></SEQNO>
-<!--280BB3827CDC4C34AC53167B360BF850--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--280BB3827CDC4C34AC53167B360BF850--></AD_FIELD>
-
<!--2C54884FAC954FB3BB1D10D880DF95AA--><AD_FIELD>
<!--2C54884FAC954FB3BB1D10D880DF95AA-->
<AD_FIELD_ID><![CDATA[2C54884FAC954FB3BB1D10D880DF95AA]]></AD_FIELD_ID>
<!--2C54884FAC954FB3BB1D10D880DF95AA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r fda935b731fe -r ad2e6b14c421 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 01 22:20:45 2010 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Mar 02 20:31:01 2010 +0100
@@ -30916,6 +30916,39 @@
<!--5D3624FE019649CCB3B5900F32E59E17-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--5D3624FE019649CCB3B5900F32E59E17--></AD_MESSAGE>
+<!--5D3624FE019649CCB3B5900F32E59E18--><AD_MESSAGE>
+<!--5D3624FE019649CCB3B5900F32E59E18-->
<AD_MESSAGE_ID><![CDATA[5D3624FE019649CCB3B5900F32E59E18]]></AD_MESSAGE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E18-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5D3624FE019649CCB3B5900F32E59E18--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5D3624FE019649CCB3B5900F32E59E18--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5D3624FE019649CCB3B5900F32E59E18-->
<VALUE><![CDATA[OUTDATED_FILES_CACHED]]></VALUE>
+<!--5D3624FE019649CCB3B5900F32E59E18--> <MSGTEXT><![CDATA[Your browser's
cache has outdated files. Please clean it and reload the page.]]></MSGTEXT>
+<!--5D3624FE019649CCB3B5900F32E59E18--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--5D3624FE019649CCB3B5900F32E59E18-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E18--></AD_MESSAGE>
+
+<!--5D3624FE019649CCB3B5900F32E59E19--><AD_MESSAGE>
+<!--5D3624FE019649CCB3B5900F32E59E19-->
<AD_MESSAGE_ID><![CDATA[5D3624FE019649CCB3B5900F32E59E19]]></AD_MESSAGE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E19-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5D3624FE019649CCB3B5900F32E59E19--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5D3624FE019649CCB3B5900F32E59E19--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5D3624FE019649CCB3B5900F32E59E19-->
<VALUE><![CDATA[BROWSER_NOT_SUPPORTED]]></VALUE>
+<!--5D3624FE019649CCB3B5900F32E59E19--> <MSGTEXT><![CDATA[Your browser is not
officially supported.\n\nYou can continue at your own risk or access the
application with one of the supported browsers:]]></MSGTEXT>
+<!--5D3624FE019649CCB3B5900F32E59E19--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--5D3624FE019649CCB3B5900F32E59E19-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E19--></AD_MESSAGE>
+
+<!--5D3624FE019649CCB3B5900F32E59E20--><AD_MESSAGE>
+<!--5D3624FE019649CCB3B5900F32E59E20-->
<AD_MESSAGE_ID><![CDATA[5D3624FE019649CCB3B5900F32E59E20]]></AD_MESSAGE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E20-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5D3624FE019649CCB3B5900F32E59E20--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5D3624FE019649CCB3B5900F32E59E20--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5D3624FE019649CCB3B5900F32E59E20-->
<VALUE><![CDATA[OR_HIGHER_TEXT]]></VALUE>
+<!--5D3624FE019649CCB3B5900F32E59E20--> <MSGTEXT><![CDATA[or
higher]]></MSGTEXT>
+<!--5D3624FE019649CCB3B5900F32E59E20--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--5D3624FE019649CCB3B5900F32E59E20-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5D3624FE019649CCB3B5900F32E59E20--></AD_MESSAGE>
+
<!--5DDBAC99880F4F159204247F691227DB--><AD_MESSAGE>
<!--5DDBAC99880F4F159204247F691227DB-->
<AD_MESSAGE_ID><![CDATA[5DDBAC99880F4F159204247F691227DB]]></AD_MESSAGE_ID>
<!--5DDBAC99880F4F159204247F691227DB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r fda935b731fe -r ad2e6b14c421
src-test/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/org/openbravo/test/AllAntTaskTests.java Mon Mar 01 22:20:45
2010 +0100
+++ b/src-test/org/openbravo/test/AllAntTaskTests.java Tue Mar 02 20:31:01
2010 +0100
@@ -50,6 +50,7 @@
import org.openbravo.test.security.AllowedOrganizationsTest;
import org.openbravo.test.security.EntityAccessTest;
import org.openbravo.test.security.WritableReadableOrganizationClientTest;
+import org.openbravo.test.system.ErrorTextParserTest;
import org.openbravo.test.system.SystemServiceTest;
import org.openbravo.test.system.SystemValidatorTest;
import org.openbravo.test.xml.ClientExportImportTest;
@@ -116,6 +117,7 @@
// system
suite.addTestSuite(SystemServiceTest.class);
suite.addTestSuite(SystemValidatorTest.class);
+ suite.addTestSuite(ErrorTextParserTest.class);
// xml
suite.addTestSuite(ClientExportImportTest.class);
diff -r fda935b731fe -r ad2e6b14c421
src-test/org/openbravo/test/AllQuickAntTaskTests.java
--- a/src-test/org/openbravo/test/AllQuickAntTaskTests.java Mon Mar 01
22:20:45 2010 +0100
+++ b/src-test/org/openbravo/test/AllQuickAntTaskTests.java Tue Mar 02
20:31:01 2010 +0100
@@ -34,6 +34,7 @@
import org.openbravo.test.security.AllowedOrganizationsTest;
import org.openbravo.test.security.EntityAccessTest;
import org.openbravo.test.security.WritableReadableOrganizationClientTest;
+import org.openbravo.test.system.ErrorTextParserTest;
import org.openbravo.test.system.SystemServiceTest;
import org.openbravo.test.system.SystemValidatorTest;
import org.openbravo.test.xml.EntityXMLImportTestBusinessObject;
@@ -98,6 +99,7 @@
// system
suite.addTestSuite(SystemServiceTest.class);
suite.addTestSuite(SystemValidatorTest.class);
+ suite.addTestSuite(ErrorTextParserTest.class);
// xml
// suite.addTestSuite(ClientExportImportTest.class);
diff -r fda935b731fe -r ad2e6b14c421
src-test/org/openbravo/test/AntTaskTests.java
--- a/src-test/org/openbravo/test/AntTaskTests.java Mon Mar 01 22:20:45
2010 +0100
+++ b/src-test/org/openbravo/test/AntTaskTests.java Tue Mar 02 20:31:01
2010 +0100
@@ -51,6 +51,7 @@
import org.openbravo.test.security.AllowedOrganizationsTest;
import org.openbravo.test.security.EntityAccessTest;
import org.openbravo.test.security.WritableReadableOrganizationClientTest;
+import org.openbravo.test.system.ErrorTextParserTest;
import org.openbravo.test.system.SystemServiceTest;
import org.openbravo.test.system.SystemValidatorTest;
import org.openbravo.test.xml.DatasetExportTest;
@@ -121,6 +122,7 @@
// system
suite.addTestSuite(SystemServiceTest.class);
suite.addTestSuite(SystemValidatorTest.class);
+ suite.addTestSuite(ErrorTextParserTest.class);
// xml
// not executing has side effects
diff -r fda935b731fe -r ad2e6b14c421
src-test/org/openbravo/test/system/ErrorTextParserTest.java
--- a/src-test/org/openbravo/test/system/ErrorTextParserTest.java Mon Mar
01 22:20:45 2010 +0100
+++ b/src-test/org/openbravo/test/system/ErrorTextParserTest.java Tue Mar
02 20:31:01 2010 +0100
@@ -23,7 +23,6 @@
import javax.servlet.ServletException;
-import org.apache.log4j.Logger;
import org.openbravo.base.provider.OBConfigFileProvider;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.database.ConnectionProvider;
@@ -40,8 +39,6 @@
public class ErrorTextParserTest extends BaseTest {
- private static final Logger log =
Logger.getLogger(ErrorTextParserTest.class);
-
public void testDuplicatePrimaryKey() throws Exception {
doErrorTextParserTest(1);
}
@@ -80,6 +77,10 @@
ConnectionProvider conn = new ConnectionProviderImpl(propFile +
"/Openbravo.properties");
VariablesSecureApp vars = new VariablesSecureApp("", "", "");
Connection con = conn.getTransactionConnection();
+
+ // set core to development to avoid the _mod_ trigger restrictions
+ ErrorTextParserTestData.setCoreInDevelopment(con, conn);
+
String errorMessage = "";
String expectedErrorMessage = "";
try {
@@ -101,7 +102,7 @@
ErrorTextParserTestData.insertClientWithName(con, conn, "System",
"System");
break;
case 5:
- expectedErrorMessage = "There is already a Month Translation with the
same (Month, Language). (Month, Language) must be unique. You must change the
values entered.";
+ expectedErrorMessage = "There is already a Month Translation with the
same (Language, Month). (Language, Month) must be unique. You must change the
values entered.";
ErrorTextParserTestData.insertMonthTrl(con, conn);
break;
case 6:
diff -r fda935b731fe -r ad2e6b14c421 src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Mon Mar 01 22:20:45 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad.java Tue Mar 02 20:31:01 2010 +0100
@@ -2932,8 +2932,10 @@
data[i].columnname = "inp" +
Sqlc.TransformaNombreColumna(data[i].columnname);
data[i].whereclause = WadUtility.getComboReloadText(code, vecFields,
parentsFieldsData,
vecReloads, "inp");
- if (data[i].whereclause.equals("") && data[i].type.equals("R"))
- data[i].whereclause = "\"inpadOrgId\"";
+
+ // Always add combo reload for organization
+ data[i].whereclause += (!data[i].whereclause.isEmpty() ? ", " : "") +
"\"inpadOrgId\"";
+
if (data[i].reference.equals("17") && data[i].whereclause.equals(""))
data[i].whereclause = "\"inp" + data[i].columnname + "\"";
if (!data[i].whereclause.equals("")
@@ -2973,8 +2975,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1, vecTables,
- vecWhere, vecParameters, vecTableParameters);
+ control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1,
+ vecTables, vecWhere, vecParameters, vecTableParameters);
where.append(tables[0].whereclause);
data[i].tablename = "TableList";
@@ -3017,8 +3019,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables, vecWhere,
- vecParameters, vecTableParameters);
+ control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables,
+ vecWhere, vecParameters, vecTableParameters);
data[i].xmltext = "";
if (vecTableParameters.size() > 0) {
@@ -3132,8 +3134,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1, vecTables,
- vecWhere, vecParameters, vecTableParameters);
+ control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1,
+ vecTables, vecWhere, vecParameters, vecTableParameters);
where.append(tables[0].whereclause);
@@ -3177,8 +3179,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables, vecWhere,
- vecParameters, vecTableParameters);
+ control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables,
+ vecWhere, vecParameters, vecTableParameters);
data[i].xmltext = "";
if (vecTableParameters.size() > 0) {
diff -r fda935b731fe -r ad2e6b14c421
src/org/openbravo/base/secureApp/Advise.html
--- a/src/org/openbravo/base/secureApp/Advise.html Mon Mar 01 22:20:45
2010 +0100
+++ b/src/org/openbravo/base/secureApp/Advise.html Tue Mar 02 20:31:01
2010 +0100
@@ -140,12 +140,12 @@
<td class="MessageBox_Icon_ContentCell">
<div class="MessageBox_Icon"></div>
</td>
- <td style="vertical-align: top;">
+ <td style="vertical-align: top;"
id="messageBoxIDContent">
<span>
<div class="MessageBox_TextTitle"
id="messageBoxIDTitle">
<span
id="paramTitulo">xxTITLE</span>
</div>
- <div
class="MessageBox_TextDescription" id="paramTexto">
+ <div
class="MessageBox_TextDescription" id="messageBoxIDMessage">
xxmessage text
</div>
<div
class="MessageBox_TextSeparator"></div>
diff -r fda935b731fe -r ad2e6b14c421 src/org/openbravo/base/secureApp/Advise.xml
--- a/src/org/openbravo/base/secureApp/Advise.xml Mon Mar 01 22:20:45
2010 +0100
+++ b/src/org/openbravo/base/secureApp/Advise.xml Tue Mar 02 20:31:01
2010 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
************************************************************************************
- * Copyright (C) 2001-2006 Openbravo S.L.
+ * Copyright (C) 2001-2010 Openbravo S.L.
* Licensed under the Apache Software License version 2.0
* You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
distributed
@@ -15,5 +15,5 @@
<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"
default="Default"/>
<PARAMETER id="paramTipo" name="ParamTipo" replace="ERROR" attribute="class"
/>
<PARAMETER id="paramTitulo" name="ParamTitulo"/>
- <PARAMETER id="paramTexto" name="ParamTexto"/>
+ <PARAMETER id="messageBoxIDMessage" name="ParamTexto"/>
</REPORT>
diff -r fda935b731fe -r ad2e6b14c421
src/org/openbravo/base/secureApp/AdvisePopUp.html
--- a/src/org/openbravo/base/secureApp/AdvisePopUp.html Mon Mar 01 22:20:45
2010 +0100
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
