details: /erp/devel/int/rev/6e98e916a1c9
changeset: 7161:6e98e916a1c9
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 29 16:52:18 2010 +0200
summary: fixed bug 13107: Error with a Process with a parameter 'Time'
details: /erp/devel/int/rev/2aa4f1cdec7c
changeset: 7162:2aa4f1cdec7c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 29 17:15:58 2010 +0200
summary: fixed bug 11637: All buttons with same id in Instance Activation
diffstat:
src-wad/src/org/openbravo/wad/WadActionButton.java | 6 +-
src-wad/src/org/openbravo/wad/controls/WADControl.java | 4 ++
src-wad/src/org/openbravo/wad/controls/WADTime.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 6 +-
src/org/openbravo/erpCommon/reference/PInstanceProcess_data.xsql | 18
+++++++++-
5 files changed, 28 insertions(+), 8 deletions(-)
diffs (105 lines):
diff -r fcb37864f70d -r 2aa4f1cdec7c
src-wad/src/org/openbravo/wad/WadActionButton.java
--- a/src-wad/src/org/openbravo/wad/WadActionButton.java Thu Apr 29
15:34:38 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/WadActionButton.java Thu Apr 29
17:15:58 2010 +0200
@@ -597,9 +597,9 @@
");\n");
} else {
html.append("PInstanceProcessData.insertPInstanceParam"
- + (control.isNumericType() ? "Number" : (control.isDate() ?
"Date" : ""))
- + "(this, pinstance, \"" + data[i].seqno + "\", \"" +
data[i].columnname + "\", str"
- + Sqlc.TransformaNombreColumna(data[i].columnname)
+ + (control.isNumericType() ? "Number" : (control.isDate() ?
"Date" : (control
+ .isTime() ? "Time" : ""))) + "(this, pinstance, \"" +
data[i].seqno + "\", \""
+ + data[i].columnname + "\", str" +
Sqlc.TransformaNombreColumna(data[i].columnname)
+ ", vars.getClient(), vars.getOrg(), vars.getUser());\n");
}
vecParams.addElement(Sqlc.TransformaNombreColumna(data[i].columnname));
diff -r fcb37864f70d -r 2aa4f1cdec7c
src-wad/src/org/openbravo/wad/controls/WADControl.java
--- a/src-wad/src/org/openbravo/wad/controls/WADControl.java Thu Apr 29
15:34:38 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADControl.java Thu Apr 29
17:15:58 2010 +0200
@@ -540,6 +540,10 @@
return false;
}
+ public boolean isTime() {
+ return false;
+ }
+
public String getReference() {
return reference;
}
diff -r fcb37864f70d -r 2aa4f1cdec7c
src-wad/src/org/openbravo/wad/controls/WADTime.java
--- a/src-wad/src/org/openbravo/wad/controls/WADTime.java Thu Apr 29
15:34:38 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADTime.java Thu Apr 29
17:15:58 2010 +0200
@@ -247,7 +247,7 @@
return displayLogic.toString();
}
- public boolean isDate() {
+ public boolean isTime() {
return true;
}
}
diff -r fcb37864f70d -r 2aa4f1cdec7c
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html Thu Apr
29 15:34:38 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html Thu Apr
29 17:15:58 2010 +0200
@@ -360,7 +360,7 @@
<td class="Button_LeftAlign_ContentCell" colspan="2">
<div>
<button type="button"
- id="buttonScan"
+ id="buttonActivateOnline"
class="ButtonLink"
onclick="openServletNewWindow('SHOW_ACTIVATE', false,
'InstanceManagement.html', 'BUTTON', null, true, 600, 900);return false;"
onfocus="buttonEvent('onfocus', this);
window.status='Browse File System'; return true;"
@@ -388,7 +388,7 @@
<td class="Button_LeftAlign_ContentCell" colspan="2">
<div>
<button type="button"
- id="buttonScan"
+ id="buttonActivateLocal"
class="ButtonLink"
onclick="openServletNewWindow('SHOW_ACTIVATE_LOCAL',
false, 'InstanceManagement.html', 'BUTTON', null, true, 600, 900);return
false;"
onfocus="buttonEvent('onfocus', this);
window.status='Browse File System'; return true;"
@@ -437,7 +437,7 @@
<td class="Button_LeftAlign_ContentCell" colspan="2">
<div>
<button type="button"
- id="buttonScan"
+ id="buttonDeactivate"
class="ButtonLink"
onclick="openServletNewWindow('SHOW_DEACTIVATE',
false, 'InstanceManagement.html', 'BUTTON', null, true, 600, 900);return
false;"
onfocus="buttonEvent('onfocus', this);
window.status='Browse File System'; return true;"
diff -r fcb37864f70d -r 2aa4f1cdec7c
src/org/openbravo/erpCommon/reference/PInstanceProcess_data.xsql
--- a/src/org/openbravo/erpCommon/reference/PInstanceProcess_data.xsql Thu Apr
29 15:34:38 2010 +0200
+++ b/src/org/openbravo/erpCommon/reference/PInstanceProcess_data.xsql Thu Apr
29 17:15:58 2010 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2006 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -118,4 +118,20 @@
<Parameter name="adUserId"/>
<Parameter name="adUserId"/>
</SqlMethod>
+
+ <SqlMethod name="insertPInstanceParamTime" type="preparedStatement"
return="rowCount">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ INSERT INTO AD_PINSTANCE_PARA (ad_pinstance_para_id, AD_PINSTANCE_ID,
SEQNO, PARAMETERNAME, P_DATE, AD_CLIENT_ID, AD_ORG_ID, CREATED, CREATEDBY,
UPDATED, UPDATEDBY)
+ VALUES(get_uuid(),?,TO_NUMBER(?),?,to_timestamp(?, 'HH24:MI:SS'), ?, ?,
now(), ?, now(), ?)
+ </Sql>
+ <Parameter name="adPinstanceId"/>
+ <Parameter name="seqno"/>
+ <Parameter name="parametername"/>
+ <Parameter name="pDate"/>
+ <Parameter name="adClientId"/>
+ <Parameter name="adOrgId"/>
+ <Parameter name="adUserId"/>
+ <Parameter name="adUserId"/>
+ </SqlMethod>
</SqlClass>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
