details: /erp/devel/pi/rev/3558450dc08f
changeset: 12249:3558450dc08f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 19 17:06:03 2011 +0200
summary: related to issue 17266: Implicit filters can be named
details: /erp/devel/pi/rev/429c766908ff
changeset: 12250:429c766908ff
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 19 17:06:40 2011 +0200
summary: related to issue 17266: Added some names to filters
details: /erp/devel/pi/rev/4137581a760a
changeset: 12251:4137581a760a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 19 17:07:41 2011 +0200
summary: fixed issue 17266: Implicit filter awareness message
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 55 ++++++++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
| 12 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
| 39 ++++++
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 21 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-messagebar.js
| 3 +-
src-db/database/model/functions/AD_LANGUAGE_CREATE.xml
| 6 +-
src-db/database/model/functions/AD_WINDOW_COPY.xml
| 12 +-
src-db/database/model/tables/AD_TAB.xml
| 4 +
src-db/database/model/tables/AD_TAB_TRL.xml
| 4 +
src-db/database/model/triggers/AD_TAB_TRG.xml
| 10 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 63 ++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml
| 13 ++
src-db/database/sourcedata/AD_FIELD.xml
| 28 ++++-
src-db/database/sourcedata/AD_TAB.xml
| 3 +
16 files changed, 270 insertions(+), 12 deletions(-)
diffs (truncated from 536 to 300 lines):
diff -r a23394d64089 -r 4137581a760a
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
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu May 19 17:07:41 2011 +0200
@@ -2059,4 +2059,59 @@
<!--FF80818130028FA501300291CE7F000C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF80818130028FA501300291CE7F000C--></AD_MESSAGE>
+<!--FF8081813008185F01300869B7AB0017--><AD_MESSAGE>
+<!--FF8081813008185F01300869B7AB0017-->
<AD_MESSAGE_ID><![CDATA[FF8081813008185F01300869B7AB0017]]></AD_MESSAGE_ID>
+<!--FF8081813008185F01300869B7AB0017-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081813008185F01300869B7AB0017--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081813008185F01300869B7AB0017--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081813008185F01300869B7AB0017-->
<VALUE><![CDATA[OBUIAPP_NeverShowMessageAgain]]></VALUE>
+<!--FF8081813008185F01300869B7AB0017--> <MSGTEXT><![CDATA[Never show this
message again]]></MSGTEXT>
+<!--FF8081813008185F01300869B7AB0017--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081813008185F01300869B7AB0017-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081813008185F01300869B7AB0017--></AD_MESSAGE>
+
+<!--FF8081813008185F0130086A5DDD001B--><AD_MESSAGE>
+<!--FF8081813008185F0130086A5DDD001B-->
<AD_MESSAGE_ID><![CDATA[FF8081813008185F0130086A5DDD001B]]></AD_MESSAGE_ID>
+<!--FF8081813008185F0130086A5DDD001B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081813008185F0130086A5DDD001B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081813008185F0130086A5DDD001B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081813008185F0130086A5DDD001B-->
<VALUE><![CDATA[OBUIAPP_ClearFilters]]></VALUE>
+<!--FF8081813008185F0130086A5DDD001B--> <MSGTEXT><![CDATA[Click the funnel
icon in the top right of the grid to clear all filters.]]></MSGTEXT>
+<!--FF8081813008185F0130086A5DDD001B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081813008185F0130086A5DDD001B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081813008185F0130086A5DDD001B--></AD_MESSAGE>
+
+<!--FF8081813008185F0130086C20B6001F--><AD_MESSAGE>
+<!--FF8081813008185F0130086C20B6001F-->
<AD_MESSAGE_ID><![CDATA[FF8081813008185F0130086C20B6001F]]></AD_MESSAGE_ID>
+<!--FF8081813008185F0130086C20B6001F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081813008185F0130086C20B6001F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081813008185F0130086C20B6001F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081813008185F0130086C20B6001F-->
<VALUE><![CDATA[OBUIAPP_FilteredGrid]]></VALUE>
+<!--FF8081813008185F0130086C20B6001F--> <MSGTEXT><![CDATA[This grid is
filtered using]]></MSGTEXT>
+<!--FF8081813008185F0130086C20B6001F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081813008185F0130086C20B6001F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081813008185F0130086C20B6001F--></AD_MESSAGE>
+
+<!--FF8081813008185F01300873148A0027--><AD_MESSAGE>
+<!--FF8081813008185F01300873148A0027-->
<AD_MESSAGE_ID><![CDATA[FF8081813008185F01300873148A0027]]></AD_MESSAGE_ID>
+<!--FF8081813008185F01300873148A0027-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081813008185F01300873148A0027--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081813008185F01300873148A0027--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081813008185F01300873148A0027-->
<VALUE><![CDATA[OBUIAPP_ImplicitFilter]]></VALUE>
+<!--FF8081813008185F01300873148A0027--> <MSGTEXT><![CDATA[implicit
filter]]></MSGTEXT>
+<!--FF8081813008185F01300873148A0027--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081813008185F01300873148A0027-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081813008185F01300873148A0027--></AD_MESSAGE>
+
+<!--FF8081813008185F013008744C5D002F--><AD_MESSAGE>
+<!--FF8081813008185F013008744C5D002F-->
<AD_MESSAGE_ID><![CDATA[FF8081813008185F013008744C5D002F]]></AD_MESSAGE_ID>
+<!--FF8081813008185F013008744C5D002F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081813008185F013008744C5D002F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081813008185F013008744C5D002F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081813008185F013008744C5D002F-->
<VALUE><![CDATA[OBUIAPP_TransactionalFilter]]></VALUE>
+<!--FF8081813008185F013008744C5D002F--> <MSGTEXT><![CDATA[transactional
filter <i>(only draft & modified documents in the last %n
day(s))</i>]]></MSGTEXT>
+<!--FF8081813008185F013008744C5D002F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081813008185F013008744C5D002F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081813008185F013008744C5D002F--></AD_MESSAGE>
+
</data>
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
Thu May 19 17:07:41 2011 +0200
@@ -187,4 +187,16 @@
<!--FF8081812E9F4334012E9F4855820012-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812E9F4334012E9F4855820012--></AD_REF_LIST>
+<!--FF8081812FFDF2EB012FFEA475F500E0--><AD_REF_LIST>
+<!--FF8081812FFDF2EB012FFEA475F500E0-->
<AD_REF_LIST_ID><![CDATA[FF8081812FFDF2EB012FFEA475F500E0]]></AD_REF_LIST_ID>
+<!--FF8081812FFDF2EB012FFEA475F500E0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812FFDF2EB012FFEA475F500E0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812FFDF2EB012FFEA475F500E0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812FFDF2EB012FFEA475F500E0-->
<VALUE><![CDATA[OBUIAPP_ShowImplicitFilterMsg]]></VALUE>
+<!--FF8081812FFDF2EB012FFEA475F500E0--> <NAME><![CDATA[Show Implicit Filter
Message]]></NAME>
+<!--FF8081812FFDF2EB012FFEA475F500E0--> <DESCRIPTION><![CDATA[If true, shows
a message when implicit filter is applied]]></DESCRIPTION>
+<!--FF8081812FFDF2EB012FFEA475F500E0-->
<AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--FF8081812FFDF2EB012FFEA475F500E0-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812FFDF2EB012FFEA475F500E0--></AD_REF_LIST>
+
</data>
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Thu May 19 17:07:41 2011 +0200
@@ -105,6 +105,7 @@
orderByClause: '${data.orderByClause?js_string}',
sortField: '${data.sortField?js_string}',
filterClause: '${data.filterClause?js_string}',
+ filterName: '${data.filterName?js_string}',
foreignKeyFieldNames:[
<#list data.foreignKeyFields as field>
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Thu May 19 17:07:41 2011 +0200
@@ -32,18 +32,22 @@
import org.openbravo.client.application.DynamicExpressionParser;
import org.openbravo.client.kernel.BaseTemplateComponent;
import org.openbravo.client.kernel.KernelUtils;
+import org.openbravo.client.kernel.RequestContext;
import org.openbravo.client.kernel.Template;
import org.openbravo.client.kernel.reference.StringUIDefinition;
import org.openbravo.client.kernel.reference.UIDefinition;
import org.openbravo.client.kernel.reference.UIDefinitionController;
import org.openbravo.dal.core.DalUtil;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.data.Sqlc;
+import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.ui.Element;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.common.order.Order;
import org.openbravo.model.common.order.OrderLine;
+import org.openbravo.service.db.DalConnectionProvider;
import org.openbravo.service.json.JsonConstants;
/**
@@ -133,6 +137,41 @@
return addTransactionalFilter("");
}
+ public String getFilterName() {
+ String filterName = "";
+
+ if (tab.getHqlfilterclause() != null) {
+ filterName = Utility.messageBD(new DalConnectionProvider(false),
"OBUIAPP_ImplicitFilter",
+ OBContext.getOBContext().getLanguage().getLanguage());
+ if (tab.getFilterName() != null) {
+ filterName += "<i>("
+ + OBViewUtil.getLabel(tab, tab.getADTabTrlList(),
Tab.PROPERTY_FILTERNAME) + ")</i>";
+ }
+ }
+
+ if (isApplyTransactionalFilter()) {
+ if (!filterName.isEmpty()) {
+ filterName += " "
+ + Utility.messageBD(new DalConnectionProvider(false), "And",
OBContext.getOBContext()
+ .getLanguage().getLanguage()) + " ";
+ }
+ filterName += Utility.messageBD(new DalConnectionProvider(false),
+ "OBUIAPP_TransactionalFilter",
OBContext.getOBContext().getLanguage().getLanguage())
+ .replace(
+ "%n",
+ Utility.getTransactionalDate(new DalConnectionProvider(false),
RequestContext.get()
+ .getVariablesSecureApp(), tab.getWindow().getId()));
+ }
+
+ if (!filterName.isEmpty()) {
+ filterName = Utility.messageBD(new DalConnectionProvider(false),
"OBUIAPP_FilteredGrid",
+ OBContext.getOBContext().getLanguage().getLanguage())
+ + " " + filterName;
+ }
+
+ return filterName;
+ }
+
private String addTransactionalFilter(String filterClause) {
if (!this.isApplyTransactionalFilter()) {
return filterClause;
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
Thu May 19 17:07:41 2011 +0200
@@ -60,15 +60,19 @@
* @return a translated name if found or otherwise the name of the owner
*/
public static String getLabel(BaseOBObject owner, List<?> trlObjects) {
+ return getLabel(owner, trlObjects, Field.PROPERTY_NAME);
+ }
+
+ public static String getLabel(BaseOBObject owner, List<?> trlObjects, String
propertyName) {
final String userLanguageId =
OBContext.getOBContext().getLanguage().getId();
for (Object o : trlObjects) {
final BaseOBObject trlObject = (BaseOBObject) o;
final String trlLanguageId = (String) DalUtil
.getId(trlObject.get(FieldTrl.PROPERTY_LANGUAGE));
if (trlLanguageId.equals(userLanguageId)) {
- return (String) trlObject.get(FieldTrl.PROPERTY_NAME);
+ return (String) trlObject.get(propertyName);
}
}
- return (String) owner.get(Field.PROPERTY_NAME);
+ return (String) owner.get(propertyName);
}
}
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Thu May 19 17:07:41 2011 +0200
@@ -286,6 +286,7 @@
return;
}
var gridIsFiltered = this.isGridFiltered(criteria);
+
if (this.filterClause && gridIsFiltered) {
this.filterImage.prompt =
OB.I18N.getLabel('OBUIAPP_GridFilterBothToolTip');
this.filterImage.show(true);
@@ -297,8 +298,28 @@
this.filterImage.show(true);
} else {
this.filterImage.prompt =
OB.I18N.getLabel('OBUIAPP_GridFilterIconToolTip');
+ if (this.view.messageBar.hasFilterMessage) {
+ this.view.messageBar.hide();
+ }
this.filterImage.hide();
}
+
+ if (this.filterClause && !this.view.messageBar.isVisible()) {
+ var showMessageProperty =
OB.PropertyStore.get('OBUIAPP_ShowImplicitFilterMsg'),
+ showMessage = (showMessageProperty !== 'N' && showMessageProperty
!== '"N"');
+ if (showMessage) {
+ this.view.messageBar.setMessage(OBMessageBar.TYPE_INFO, '<div><div
style="float: left;">'+
+ this.filterName + ' ' + OB.I18N.getLabel('OBUIAPP_ClearFilters') +
+ '</div><div style="float: right; padding: 15px; padding-bottom:
0;"><a href="#" style="font-weight:normal; color:inherit;"
onclick="console.log(\''+
+ this.view.messageBar.ID+'\'); window[\''+
+ this.view.messageBar.ID+'\'].hide();
OB.PropertyStore.set(\'OBUIAPP_ShowImplicitFilterMsg\', \'N\');">'+
+
OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain')+'</a></div></div>',' ');
+ this.view.messageBar.hasFilterMessage = true;
+ }
+ }
+
+
+
},
isGridFiltered: function(criteria) {
diff -r a23394d64089 -r 4137581a760a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-messagebar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-messagebar.js
Thu May 19 17:01:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-messagebar.js
Thu May 19 17:07:41 2011 +0200
@@ -69,7 +69,7 @@
this.text.setContents(text);
} else {
// TODO: low-prio, move styling to a css class
- this.text.setContents('<b>' + title + '</b><br/>' + text);
+ this.text.setContents('<b>' + title + '</b>' + (text? '<br/>'+ text:''));
}
},
@@ -99,6 +99,7 @@
text = newText + '</ul>';
}
this.setText(title || this.getDefaultTitle(type), text);
+ delete this.hasFilterMessage;
this.show();
},
diff -r a23394d64089 -r 4137581a760a
src-db/database/model/functions/AD_LANGUAGE_CREATE.xml
--- a/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml Thu May 19
17:01:35 2011 +0200
+++ b/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml Thu May 19
17:07:41 2011 +0200
@@ -292,10 +292,12 @@
INTO AD_Tab_Trl
(
AD_Tab_Trl_ID, AD_Tab_ID, AD_Language, Name, Description,
- Help, IsTranslated, Createdby, UpdatedBy,
+ Help, filterName,
+ IsTranslated, Createdby, UpdatedBy,
AD_Client_ID, AD_Org_ID
)
- SELECT get_uuid(), AD_Tab_ID, AD_Language.AD_Language, AD_Tab.Name,
AD_Tab.Description, AD_Tab.Help, 'N', '0', '0', '0', '0'
+ SELECT get_uuid(), AD_Tab_ID, AD_Language.AD_Language, AD_Tab.Name,
AD_Tab.Description,
+ AD_Tab.Help, filterName, 'N', '0', '0', '0', '0'
FROM AD_Tab, AD_Language, AD_MODULE M
WHERE AD_Language.IsActive='Y'
AND AD_Language.IsSystemLanguage='Y'
diff -r a23394d64089 -r 4137581a760a
src-db/database/model/functions/AD_WINDOW_COPY.xml
--- a/src-db/database/model/functions/AD_WINDOW_COPY.xml Thu May 19
17:01:35 2011 +0200
+++ b/src-db/database/model/functions/AD_WINDOW_COPY.xml Thu May 19
17:07:41 2011 +0200
@@ -119,7 +119,8 @@
NAME, DESCRIPTION, HELP, AD_TABLE_ID, TabLevel,
SEQNO, ISSINGLEROW, ISINFOTAB, ISTRANSLATIONTAB, ISREADONLY,
AD_COLUMN_ID, HASTREE, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
- AD_PROCESS_ID, PROCESSING, AD_Module_ID
+ AD_PROCESS_ID, PROCESSING, AD_Module_ID,
+ FilterName
)
select
v_NextNo_T, v_Record_ID,
@@ -127,7 +128,8 @@
coalesce(sub.name, Cur_Tabs.NAME), coalesce(sub.description,
Cur_Tabs.DESCRIPTION), coalesce(sub.help, Cur_Tabs.HELP), Cur_Tabs.AD_TABLE_ID,
Cur_Tabs.TabLevel,
Cur_Tabs.SEQNO, Cur_Tabs.ISSINGLEROW, Cur_Tabs.ISINFOTAB,
Cur_Tabs.ISTRANSLATIONTAB, Cur_Tabs.ISREADONLY,
Cur_Tabs.AD_COLUMN_ID, Cur_Tabs.HASTREE, Cur_Tabs.WHERECLAUSE,
Cur_Tabs.ORDERBYCLAUSE, Cur_Tabs.COMMITWARNING,
- Cur_Tabs.AD_PROCESS_ID, Cur_Tabs.PROCESSING, v_dest_ad_module_id
+ Cur_Tabs.AD_PROCESS_ID, Cur_Tabs.PROCESSING, v_dest_ad_module_id,
+ coalesce(sub.filterName, Cur_Tabs.filterName)
FROM ad_tab s left join
(select * from AD_tab_trl where ad_language=v_dest_ad_module_lang and
ad_tab_id=Cur_Tabs.ad_tab_id ) sub
on sub.ad_tab_id=s.ad_tab_id where s.ad_tab_id=Cur_Tabs.ad_tab_id;
@@ -151,6 +153,12 @@
WHERE s.AD_Language=AD_Tab_Trl.AD_Language and
s.AD_Tab_ID=Cur_Tabs.AD_Tab_ID), Cur_Tabs.help)
FROM ad_tab t
WHERE t.AD_Tab_ID=Cur_Tabs.AD_Tab_ID)
+ ,
+ FilterName=
+ (SELECT coalesce((select FilterName from AD_Tab_Trl s
+ WHERE s.AD_Language=AD_Tab_Trl.AD_Language and
s.AD_Tab_ID=Cur_Tabs.AD_Tab_ID), Cur_Tabs.FilterName)
+ FROM ad_tab t
+ WHERE t.AD_Tab_ID=Cur_Tabs.AD_Tab_ID)
WHERE AD_Tab_Trl.AD_Tab_ID=v_NextNo_T;
-- Copy Fields
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
