details: /erp/devel/pi/rev/4e5067b53ec1
changeset: 10820:4e5067b53ec1
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 18:08:21 2011 +0100
summary: Fixes issue 0015935: Inhomogeneous behavior when searching in Copy
From Settlement
It has been added the code to refresh also the description button and it has
been made the description field a little bit higher to make it look what it is:
a multiline field
details: /erp/devel/pi/rev/91f6db342f9b
changeset: 10821:91f6db342f9b
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Feb 21 18:09:24 2011 +0100
summary: Fixes issue 0015935: Inhomogeneous behavior when searching in Copy
From Settlement
It has been fixed the behavior of searching by % to make it behave the same way
as other search windows and selectors
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html | 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java | 21
++++++++-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml | 3 +-
3 files changed, 20 insertions(+), 6 deletions(-)
diffs (77 lines):
diff -r 7265d977ebe5 -r 91f6db342f9b
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
Mon Feb 21 17:58:56 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
Mon Feb 21 18:09:24 2011 +0100
@@ -339,7 +339,7 @@
</tr>
<tr>
<td class="TitleCell"><span
class="LabelText">Description:</span></td>
- <td class="TextBox_ContentCell" colspan="5"> <textarea
class="dojoValidateValid TextArea_FiveCells_width" cols="70" rows="2"
name="inpDescription" id="paramDescription" onclick="logChanges(this);return
true;"></textarea></td>
+ <td class="TextBox_ContentCell" colspan="5"> <textarea
class="dojoValidateValid TextArea_FiveCells_width TextArea_Medium_height"
cols="70" rows="2" name="inpDescription" id="paramDescription"
onclick="logChanges(this);return true;"></textarea></td>
</tr>
<tr><td style="height: 15px;"></td></tr>
<tr>
diff -r 7265d977ebe5 -r 91f6db342f9b
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java
Mon Feb 21 17:58:56 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java
Mon Feb 21 18:09:24 2011 +0100
@@ -233,8 +233,14 @@
log4j.debug("Output: Button process Copy from Settlement");
String[] discard = { "", "" };
- CopyFromSettlementData[] data =
CopyFromSettlementData.selectRelation(this, "%"
- + strSetDescription + "%", "%" + strDocumentNo + "%",
Utility.getContext(this, vars,
+
+ String myStrDocumentNo = (strDocumentNo == null || strDocumentNo
+ .equals("")) ? "%" : strDocumentNo;
+ String myStrSetDescription = (strSetDescription == null ||
strSetDescription
+ .equals("")) ? "%" : strSetDescription;
+
+ CopyFromSettlementData[] data = CopyFromSettlementData.selectRelation(this,
+ myStrSetDescription, myStrDocumentNo, Utility.getContext(this, vars,
"#User_Org", strWindow), Utility.getContext(this, vars,
"#User_Client", strWindow),
strDateFrom, strDateTo);
@@ -257,6 +263,7 @@
xmlDocument.setParameter("theme", vars.getTheme());
xmlDocument.setParameter("paramSettlement", strSettlement);
xmlDocument.setParameter("documentNo", strDocumentNo);
+ xmlDocument.setParameter("description", strSetDescription);
xmlDocument.setData("structure", data);
response.setContentType("text/html; charset=UTF-8");
PrintWriter out = response.getWriter();
@@ -276,8 +283,13 @@
String[] discard = { "", "" };
- CopyFromSettlementData[] data =
CopyFromSettlementData.selectRelation(this, "%"
- + strDescription + "%", "%" + strDocumentNo + "%",
Utility.getContext(this, vars,
+ String myStrDocumentNo = (strDocumentNo == null || strDocumentNo
+ .equals("")) ? "%" : strDocumentNo;
+ String myStrDescription = (strDescription == null || strDescription
+ .equals("")) ? "%" : strDescription;
+
+ CopyFromSettlementData[] data = CopyFromSettlementData.selectRelation(this,
+ myStrDescription, myStrDocumentNo, Utility.getContext(this, vars,
"#User_Org", strWindow), Utility.getContext(this, vars,
"#User_Client", strWindow),
strDateFrom, strDateTo);
@@ -307,6 +319,7 @@
xmlDocument.setParameter("paramSettlementId", strSettlement);
xmlDocument.setParameter("paramSettlementFromId", strSettlementFrom);
xmlDocument.setParameter("documentNo", strDocumentNo);
+ xmlDocument.setParameter("description", strDescription);
xmlDocument.setData("structure", data);
xmlDocument.setData("structure2", data2);
response.setContentType("text/html; charset=UTF-8");
diff -r 7265d977ebe5 -r 91f6db342f9b
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
Mon Feb 21 17:58:56 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
Mon Feb 21 18:09:24 2011 +0100
@@ -40,7 +40,8 @@
<PARAMETER id="paramSettlement" name="paramSettlement" attribute="value"
default=""/>
<PARAMETER id="paramSettlementFromId" name="paramSettlementFromId"
attribute="value" default=""/>
<PARAMETER id="paramSettlementId" name="paramSettlementId" attribute="value"
default=""/>
- <PARAMETER id="paramDocumentNo" name="documentNo" attribute="value"
default=""/>
+ <PARAMETER id="paramDocumentNo" name="documentNo" attribute="value"
default=""/>
+ <PARAMETER id="paramDescription" name="description" default="" />
<PARAMETER id="param2" name="param2" default="2"/>
------------------------------------------------------------------------------
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
