details: /erp/devel/pi/rev/1225db11363f
changeset: 10568:1225db11363f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 11 12:26:19 2011 +0100
summary: Change currency_id to isParent so that the Currency Conversion Rates
tab works correctly in 3.0
details: /erp/devel/pi/rev/7c14027bb49a
changeset: 10569:7c14027bb49a
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 11 12:39:24 2011 +0100
summary: Add filtering by client to the client window, using whereclause and
setting the client parameter
diffstat:
modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java
| 6 ++++++
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_TAB.xml
| 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diffs (48 lines):
diff -r fc05b13dc731 -r 7c14027bb49a
modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java
Fri Feb 11 12:24:43 2011 +0100
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java
Fri Feb 11 12:39:24 2011 +0100
@@ -340,6 +340,12 @@
typedParameters.add(cal.getTime());
}
+ if (whereClause.contains(JsonConstants.QUERY_PARAM_CLIENT)) {
+ final String alias = getTypedParameterAlias();
+ String clientId = (String)
DalUtil.getId(OBContext.getOBContext().getCurrentClient());
+ whereClause = whereClause.replace(JsonConstants.QUERY_PARAM_CLIENT,
alias);
+ typedParameters.add(clientId);
+ }
whereClause = setRequestParameters(whereClause);
whereClause = substituteContextParameters(whereClause);
diff -r fc05b13dc731 -r 7c14027bb49a src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Feb 11 12:24:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Feb 11 12:39:24 2011 +0100
@@ -14205,7 +14205,7 @@
<!--786--> <AD_REFERENCE_VALUE_ID><![CDATA[112]]></AD_REFERENCE_VALUE_ID>
<!--786--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
<!--786--> <ISKEY><![CDATA[N]]></ISKEY>
-<!--786--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--786--> <ISPARENT><![CDATA[Y]]></ISPARENT>
<!--786--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--786--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--786--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
diff -r fc05b13dc731 -r 7c14027bb49a src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Fri Feb 11 12:24:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml Fri Feb 11 12:39:24 2011 +0100
@@ -626,7 +626,7 @@
<!--127--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--127--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--127--> <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--127-->
<HQLWHERECLAUSE><![CDATA[[email protected]@]]></HQLWHERECLAUSE>
+<!--127--> <HQLWHERECLAUSE><![CDATA[1=1]]></HQLWHERECLAUSE>
<!--127--></AD_TAB>
<!--128--><AD_TAB>
@@ -883,6 +883,7 @@
<!--145--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--145--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--145--> <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--145--> <HQLWHERECLAUSE><![CDATA[e.id=@client@ or
e.id='0']]></HQLWHERECLAUSE>
<!--145--></AD_TAB>
<!--146--><AD_TAB>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
