details: /erp/devel/pi/rev/45167772b28a
changeset: 10882:45167772b28a
user: Asier Galdos <asier.galdos <at> almis.com>
date: Thu Feb 24 12:31:20 2011 +0100
summary: Fixing layout - About Window Popup
details: /erp/devel/pi/rev/612890496718
changeset: 10883:612890496718
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Feb 24 18:37:57 2011 +0100
summary: Merge changes from pi-agaldos branch
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 13 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
| 52 ++-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 1 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 7 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 4 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
| 131 +++++----
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 2 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js
| 10 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 3 +-
modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
| 5 +
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
| 35 ++-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
| 12 +
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
| 25 +
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 1 +
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 52 ++-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
| 13 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 10 +-
modules/org.openbravo.v3/src-db/database/configScript.xml
| 4 -
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 13 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 47 +++
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html
| 42 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
| 6 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
| 7 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml
| 1 +
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
| 21 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml
| 1 +
src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
| 2 +-
src/org/openbravo/erpCommon/businessUtility/COAUtility.java
| 10 +-
src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java
| 4 +-
src/org/openbravo/erpCommon/obps/GetOpenbravoLogoGen.java
| 78 +++++
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
web/images/PoweredByOpenbravo.png
| 0
web/images/PoweredByOpenbravoGen.png
| 0
web/images/PoweredByOpenbravoGenOPS.png
| 0
web/images/PoweredByOpenbravoOPS.png
| 0
web/js/utils.js
| 2 +-
web/skins/Default/Openbravo_ERP_250.css
| 4 +-
44 files changed, 518 insertions(+), 157 deletions(-)
diffs (truncated from 1739 to 300 lines):
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Thu Feb 24 18:37:57 2011 +0100
@@ -19,6 +19,7 @@
<!--14ED4E3D75274AB3A59F3941D64027BE--> <SORTNO><![CDATA[2]]></SORTNO>
<!--14ED4E3D75274AB3A59F3941D64027BE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--14ED4E3D75274AB3A59F3941D64027BE--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--14ED4E3D75274AB3A59F3941D64027BE-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--14ED4E3D75274AB3A59F3941D64027BE--></OBUISEL_SELECTOR_FIELD>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--><OBUISEL_SELECTOR_FIELD>
@@ -42,6 +43,7 @@
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <SORTNO><![CDATA[2]]></SORTNO>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--17843AC2A9E247E1A6DAD8041DFDB07A-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--17843AC2A9E247E1A6DAD8041DFDB07A--></OBUISEL_SELECTOR_FIELD>
<!--334D0D40EF224D5CA5B9AA56124FEE25--><OBUISEL_SELECTOR_FIELD>
@@ -63,6 +65,7 @@
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <SORTNO><![CDATA[3]]></SORTNO>
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--334D0D40EF224D5CA5B9AA56124FEE25--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--334D0D40EF224D5CA5B9AA56124FEE25-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--334D0D40EF224D5CA5B9AA56124FEE25--></OBUISEL_SELECTOR_FIELD>
<!--34940C0A024A4C438BF57B4A12E656E5--><OBUISEL_SELECTOR_FIELD>
@@ -84,6 +87,7 @@
<!--34940C0A024A4C438BF57B4A12E656E5--> <SORTNO><![CDATA[1]]></SORTNO>
<!--34940C0A024A4C438BF57B4A12E656E5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--34940C0A024A4C438BF57B4A12E656E5--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--34940C0A024A4C438BF57B4A12E656E5-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--34940C0A024A4C438BF57B4A12E656E5--></OBUISEL_SELECTOR_FIELD>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--><OBUISEL_SELECTOR_FIELD>
@@ -103,6 +107,7 @@
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <SORTNO><![CDATA[5]]></SORTNO>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--4EAE4C4E9A464871A71B5F7F8DC1C5A0--></OBUISEL_SELECTOR_FIELD>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--><OBUISEL_SELECTOR_FIELD>
@@ -124,6 +129,7 @@
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <SORTNO><![CDATA[5]]></SORTNO>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
<!--5C35042E8E9D426485AC3CE5C7200A7D--><OBUISEL_SELECTOR_FIELD>
@@ -143,6 +149,7 @@
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <SORTNO><![CDATA[6]]></SORTNO>
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--5C35042E8E9D426485AC3CE5C7200A7D--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--5C35042E8E9D426485AC3CE5C7200A7D-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--5C35042E8E9D426485AC3CE5C7200A7D--></OBUISEL_SELECTOR_FIELD>
<!--616F97738AFD4595B74A6A60C8D4B5C4--><OBUISEL_SELECTOR_FIELD>
@@ -164,6 +171,7 @@
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <SORTNO><![CDATA[1]]></SORTNO>
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--616F97738AFD4595B74A6A60C8D4B5C4--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--616F97738AFD4595B74A6A60C8D4B5C4-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--616F97738AFD4595B74A6A60C8D4B5C4--></OBUISEL_SELECTOR_FIELD>
<!--64F6733BE6654339AE67403E0925F525--><OBUISEL_SELECTOR_FIELD>
@@ -185,6 +193,7 @@
<!--64F6733BE6654339AE67403E0925F525--> <SORTNO><![CDATA[3]]></SORTNO>
<!--64F6733BE6654339AE67403E0925F525--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--64F6733BE6654339AE67403E0925F525--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--64F6733BE6654339AE67403E0925F525-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--64F6733BE6654339AE67403E0925F525--></OBUISEL_SELECTOR_FIELD>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--><OBUISEL_SELECTOR_FIELD>
@@ -206,6 +215,7 @@
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <SORTNO><![CDATA[4]]></SORTNO>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--8EE2C299C0D7421DBEFE0FEBC9DED657-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--8EE2C299C0D7421DBEFE0FEBC9DED657--></OBUISEL_SELECTOR_FIELD>
<!--B67B839A695A44499277CF0D09FAC54F--><OBUISEL_SELECTOR_FIELD>
@@ -227,6 +237,7 @@
<!--B67B839A695A44499277CF0D09FAC54F--> <SORTNO><![CDATA[4]]></SORTNO>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B67B839A695A44499277CF0D09FAC54F--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B67B839A695A44499277CF0D09FAC54F-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--B67B839A695A44499277CF0D09FAC54F--></OBUISEL_SELECTOR_FIELD>
<!--C55EADA2C49F47DF8423C6BB8B97342E--><OBUISEL_SELECTOR_FIELD>
@@ -248,6 +259,7 @@
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <SORTNO><![CDATA[0]]></SORTNO>
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C55EADA2C49F47DF8423C6BB8B97342E--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--C55EADA2C49F47DF8423C6BB8B97342E-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--C55EADA2C49F47DF8423C6BB8B97342E--></OBUISEL_SELECTOR_FIELD>
<!--C5CFD3978631444EB97539BCEE3D5239--><OBUISEL_SELECTOR_FIELD>
@@ -269,6 +281,7 @@
<!--C5CFD3978631444EB97539BCEE3D5239--> <SORTNO><![CDATA[0]]></SORTNO>
<!--C5CFD3978631444EB97539BCEE3D5239--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C5CFD3978631444EB97539BCEE3D5239--> <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--C5CFD3978631444EB97539BCEE3D5239-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--C5CFD3978631444EB97539BCEE3D5239--></OBUISEL_SELECTOR_FIELD>
</data>
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Thu Feb 24 18:37:57 2011 +0100
@@ -25,6 +25,9 @@
import java.util.StringTokenizer;
import org.openbravo.client.kernel.KernelUtils;
+import org.openbravo.client.kernel.reference.UIDefinition;
+import org.openbravo.client.kernel.reference.UIDefinitionController;
+import org.openbravo.client.kernel.reference.YesNoUIDefinition;
import org.openbravo.model.ad.ui.AuxiliaryInput;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
@@ -95,15 +98,16 @@
+ strAux.substring(pos[0] + COMPARATIONS[pos[1]][0].length(),
strAux.length());
}
- String leftPart = getDisplayLogicText(token);
- jsCode.append(leftPart);
+ DisplayLogicElement leftPart = getDisplayLogicText(token, false, false);
+ jsCode.append(leftPart.text);
if (pos[0] >= 0) {
jsCode.append(COMPARATIONS[pos[1]][1]);
}
- String rightPart = getDisplayLogicText(token2);
- jsCode.append(leftPart.contains("currentValues") ?
transformValue(rightPart) : rightPart);
+ DisplayLogicElement rightPart = getDisplayLogicText(token2, leftPart.text
+ .contains("currentValues"), leftPart.isBoolean);
+ jsCode.append(rightPart.text);
}
}
@@ -157,9 +161,11 @@
/*
* This method was partially copied from WadUtility.
*/
- private String getDisplayLogicText(String token) {
+ private DisplayLogicElement getDisplayLogicText(String token, boolean
transformValue,
+ boolean boolLeftToken) {
StringBuffer strOut = new StringBuffer();
String localToken = token;
+ boolean boolToken = false;
int i = localToken.indexOf("@");
while (i != -1) {
strOut.append(localToken.substring(0, i));
@@ -168,37 +174,46 @@
if (i != -1) {
String strAux = localToken.substring(0, i);
localToken = localToken.substring(i + 1);
- String st = getDisplayLogicTextTranslate(strAux);
- strOut.append(st);
+ DisplayLogicElement displayLogicElement =
getDisplayLogicTextTranslate(strAux);
+ // It needn't boolean transformation as it is a token like @column@
+ strOut.append(displayLogicElement.text);
+ boolToken = boolToken || displayLogicElement.isBoolean;
}
i = localToken.indexOf("@");
}
- strOut.append(localToken);
- return strOut.toString();
+ // Do boolean transformation in case comparison left member is a boolean
column
+ strOut.append(transformValue && boolLeftToken ? transformValue(localToken)
: localToken);
+ return new DisplayLogicElement(strOut.toString(), boolToken);
}
/*
* This method is a different reimplementation of an equivalent method in
WadUtility
*/
- private String getDisplayLogicTextTranslate(String token) {
+ private DisplayLogicElement getDisplayLogicTextTranslate(String token) {
if (token == null || token.trim().equals(""))
- return "";
+ return new DisplayLogicElement("", false);
for (Field field : tab.getADFieldList()) {
if (token.equalsIgnoreCase(field.getColumn().getDBColumnName())) {
fieldsInExpression.add(field);
final String fieldName =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn())
.getName();
- return "currentValues." + fieldName;
+
+ UIDefinition uiDef =
UIDefinitionController.getInstance().getUIDefinition(
+ field.getColumn().getId());
+
+ return new DisplayLogicElement("currentValues." + fieldName,
+ uiDef instanceof YesNoUIDefinition);
}
}
for (AuxiliaryInput auxIn : tab.getADAuxiliaryInputList()) {
if (token.equalsIgnoreCase(auxIn.getName())) {
auxInputsInExpression.add(auxIn);
- return TOKEN_PREFIX + auxIn.getName();
+ return new DisplayLogicElement(TOKEN_PREFIX + auxIn.getName(), false);
}
}
sessionAttributesInExpression.add(token);
- return TOKEN_PREFIX + (token.startsWith("#") ? token.replace("#", "_") :
token);
+ return new DisplayLogicElement(TOKEN_PREFIX
+ + (token.startsWith("#") ? token.replace("#", "_") : token), false);
}
/*
@@ -216,4 +231,13 @@
return min;
}
+ private class DisplayLogicElement {
+ boolean isBoolean;
+ String text;
+
+ public DisplayLogicElement(String text, boolean isBoolean) {
+ this.text = text;
+ this.isBoolean = isBoolean;
+ }
+ }
}
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Thu Feb 24 18:37:57 2011 +0100
@@ -83,8 +83,8 @@
OB.TopLayout.OpenbravoLogo = isc.Img.create({
imageType: 'normal',
- imageWidth: '122',
- imageHeight: '34',
+ imageWidth: '130',
+ imageHeight: '32',
src: OB.Application.contextUrl + 'utility/GetOpenbravoLogo.png',
getInnerHTML: function() {
var html = this.Super('getInnerHTML', arguments);
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu Feb 24 18:37:57 2011 +0100
@@ -29,7 +29,6 @@
rowSpan: ${fieldDefinition.rowSpan},
startRow: ${fieldDefinition.startRow?string},
endRow: ${fieldDefinition.endRow?string},
- width: '*',
<#if fieldDefinition.standardField>
columnName: '${fieldDefinition.columnName?string}',
inpColumnName: '${fieldDefinition.inpColumnName?string}',
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu Feb 24 18:37:57 2011 +0100
@@ -871,10 +871,11 @@
// with the new value
UIDefinition uiDef =
UIDefinitionController.getInstance().getUIDefinition(
col.getId());
- if (uiDef.getDomainType() instanceof
PrimitiveDomainType) {
+ if (el instanceof String
+ || !(uiDef.getDomainType() instanceof
PrimitiveDomainType)) {
+ rq.setRequestParameter(colId, el == null ? null :
(String) el);
+ } else {
rq.setRequestParameter(colId,
uiDef.convertToClassicString(el));
- } else {
- rq.setRequestParameter(colId, el == null ? null :
el.toString());
}
JSONObject jsonobj = new
JSONObject(uiDef.getFieldProperties(inpFields
.get(name), true));
diff -r 9bbe067ee20c -r 612890496718
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Thu Feb 24 09:31:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Thu Feb 24 18:37:57 2011 +0100
@@ -144,7 +144,7 @@
if (!ActivationKey.getInstance().isActive() ||
tab.getTable().isFullyAudited()) {
IconButton auditBtn = new IconButton();
auditBtn.type = "audit";
- auditBtn.label = Utility.messageBD(new DalConnectionProvider(),
"AuditTrail", OBContext
+ auditBtn.label = Utility.messageBD(new DalConnectionProvider(false),
"AuditTrail", OBContext
.getOBContext().getLanguage().getLanguage());
auditBtn.action = "OB.ToolbarUtils.showAuditTrail(this.view);";
iconButtons.add(auditBtn);
@@ -154,7 +154,7 @@
if (tab.isTreeIncluded()) {
IconButton treeBtn = new IconButton();
treeBtn.type = "tree";
- treeBtn.label = Utility.messageBD(new DalConnectionProvider(), "Tree",
OBContext
+ treeBtn.label = Utility.messageBD(new DalConnectionProvider(false),
"Tree", OBContext
.getOBContext().getLanguage().getLanguage());
treeBtn.action = "OB.ToolbarUtils.showTree(this.view);";
iconButtons.add(treeBtn);
@@ -172,7 +172,7 @@
if (printBtn.hasEmail) {
IconButton emailBtn = new IconButton();
emailBtn.type = "email";
- emailBtn.label = Utility.messageBD(new DalConnectionProvider(), "Email",
OBContext
+ emailBtn.label = Utility.messageBD(new DalConnectionProvider(false),
"Email", OBContext
.getOBContext().getLanguage().getLanguage());
emailBtn.action = printBtn.action.replace("print.html", "send.html");
btns.add(emailBtn);
@@ -613,7 +613,7 @@
type = "print";
action = "OB.ToolbarUtils.print(this.view, '" + processUrl + "', " +
process.isDirectPrint()
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
