[OpenbravoERP-commits] devel/pi: fixed bug 12934: The datetime reference does not work ...

hg Mon, 12 Apr 2010 07:09:47 -0700

details:   /erp/devel/pi/rev/34903830bf34
changeset: 6979:34903830bf34
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Apr 12 16:09:13 2010 +0200
summary:   fixed bug 12934: The datetime reference does not work properly


diffstat:

 src-wad/src/org/openbravo/wad/datasource.xsqlxml |  17 ++++++++++-------
 src-wad/src/org/openbravo/wad/javasource.javaxml |   2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 82cda6a18365 -r 34903830bf34 
src-wad/src/org/openbravo/wad/datasource.xsqlxml
--- a/src-wad/src/org/openbravo/wad/datasource.xsqlxml  Mon Apr 12 13:43:10 
2010 +0200
+++ b/src-wad/src/org/openbravo/wad/datasource.xsqlxml  Mon Apr 12 16:09:13 
2010 +0200
@@ -66,14 +66,14 @@
   <SqlMethod name="select" type="preparedStatement" return="multiple">
     <SqlMethodComment>Select for relation</SqlMethodComment>
     <Sql>&#60;&#33;[CDATA[
-        SELECT <PARAMETER_TMP id="fields">field</PARAMETER_TMP> 
+        SELECT to_char(<PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.Created, ?) as created, 
+        (SELECT NAME FROM AD_USER u WHERE AD_USER_ID = <PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.CreatedBy) as CreatedByR, 
+        to_char(<PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, ?) as 
updated, 
+        to_char(<PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, 
'YYYYMMDDHH24MISS') as Updated_Time_Stamp,  
+        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy, 
+        (SELECT NAME FROM AD_USER u WHERE AD_USER_ID = <PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.UpdatedBy) as UpdatedByR, 
+        <PARAMETER_TMP id="fields">field</PARAMETER_TMP> 
         '' AS TR_BGCOLOR, '' as total_count,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.Created, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.CreatedBy, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.CreatedBy AS 
CreatedByR,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy AS 
UpdatedByR,
         ? AS LANGUAGE, '' AS AD_USER_CLIENT, '' AS AD_ORG_CLIENT
         FROM <PARAMETER_TMP id="table">table</PARAMETER_TMP><PARAMETER_TMP 
id="tables">tables</PARAMETER_TMP>
         WHERE 2=2 <PARAMETER_TMP id="where">tablesWhere</PARAMETER_TMP>
@@ -84,6 +84,9 @@
         ORDER BY 1, 1
 <!--PARAMETER_TMP id="order">tablesOrder</PARAMETER_TMP-->
     ]]&#62;</Sql>
+    <Parameter name="dateTimeFormat"/>
+    <Parameter name="dateTimeFormat"/>
+    <PARAMETER_TMP id="parameterFields">xx</PARAMETER_TMP>
     <PARAMETER_TMP id="hasOrgKey"><Field name="currentAdOrgId" 
value=""/></PARAMETER_TMP>
     <Parameter name="paramLanguage"/>
     <PARAMETER_TMP id="parameters">xx</PARAMETER_TMP>
diff -r 82cda6a18365 -r 34903830bf34 
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml  Mon Apr 12 13:43:10 
2010 +0200
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml  Mon Apr 12 16:09:13 
2010 +0200
@@ -940,7 +940,7 @@
         if (<PARAMETER_TMP id="paramSearchName">xx</PARAMETER_TMP> &amp;&amp; 
str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.equals("")) {
           buscador = "openSearchWindow('../businessUtility/Buscador.html', 
'BUSCADOR', " + tabId + ", '<PARAMETER_TMP 
id="windowName">Window</PARAMETER_TMP>/<PARAMETER_TMP 
id="class">Almacen</PARAMETER_TMP>_Relation.html', " + windowId + ");";
         } else if (str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.equals("")) {
-          <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[] data1 = 
<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data.select(this, 
vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><FIELDS_TMP id="isTransactional">, 
strParamTransaccional</FIELDS_TMP><FIELDS_TMP id="sectionFilter">, 
strParamFilter</FIELDS_TMP><PARAMETER_TMP id="sectionIsHighVolume2Edit">, 
strParam<PARAMETER_TMP 
id="searchName2Edit">xx</PARAMETER_TMP></PARAMETER_TMP><PARAMETER_TMP 
id="sectionIsHighVolume4">, strParamSessionDate, 
vars.getUser()</PARAMETER_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="org">, Utility.getContext(this, 
vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="parent">, strP<PARENT_TMP 
id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, strOrderByFilter);
+          <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[] data1 = 
<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data.select(this, 
vars.getSessionValue("#AD_SqlDateTimeFormat"), vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><FIELDS_TMP id="isTransactional">, 
strParamTransaccional</FIELDS_TMP><FIELDS_TMP id="sectionFilter">, 
strParamFilter</FIELDS_TMP><PARAMETER_TMP id="sectionIsHighVolume2Edit">, 
strParam<PARAMETER_TMP 
id="searchName2Edit">xx</PARAMETER_TMP></PARAMETER_TMP><PARAMETER_TMP 
id="sectionIsHighVolume4">, strParamSessionDate, 
vars.getUser()</PARAMETER_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="org">, Utility.getContext(this, 
vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="parent">, strP<PARENT_TMP 
id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, strOrderByFilter);
           data = new <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[1];
           if (data1!=null &#38;&#38; data1.length!=0) data[0] = data1[0];
         } else </FIELDS_TMP></PARAMETER_TMP>data = <PARAMETER_TMP 
id="class">Almacen</PARAMETER_TMP>Data.selectEdit(this, 
vars.getSessionValue("#AD_SqlDateTimeFormat"), vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><PARAMETER_TMP id="parent">, 
strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, 
str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId), 
Utility.getContext(this, vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP>);

------------------------------------------------------------------------------
Download Intel&#174; 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

[OpenbravoERP-commits] devel/pi: fixed bug 12934: The datetime reference does not work ...

Reply via email to