details: /erp/devel/pi/rev/08a220fdf2ea
changeset: 12118:08a220fdf2ea
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed May 11 18:06:05 2011 +0200
summary: Fixes issue 17122. GLR in XLS format gets numbers
details: /erp/devel/pi/rev/ff48f6570c57
changeset: 12119:ff48f6570c57
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed May 11 18:07:12 2011 +0200
summary: Fixes issue 16229 Payment Method added to callout in Multiphase
Project Window
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java | 9
++++++---
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diffs (52 lines):
diff -r 32377e637a05 -r ff48f6570c57
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java Thu May
12 00:45:35 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java Wed May
11 18:07:12 2011 +0200
@@ -72,13 +72,15 @@
log4j.debug("Output: dataSheet");
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
- String strPaymentrule, strPaymentterm, strPricelist;
- strPaymentrule = strPaymentterm = strPricelist = "";
+ String strPaymentrule, strPaymentterm, strPricelist, strPaymentMethod;
+ strPaymentrule = strPaymentterm = strPricelist = strPaymentMethod = "";
BpartnerMiscData[] data = BpartnerMiscData.select(this, strBPartner);
if (data != null && data.length > 0) {
strPaymentrule = (strIsSOTrx.equals("Y") ? data[0].paymentrule :
data[0].paymentrulepo);
strPaymentterm = (strIsSOTrx.equals("Y") ? data[0].cPaymenttermId :
data[0].poPaymenttermId);
strPricelist = (strIsSOTrx.equals("Y") ? data[0].mPricelistId :
data[0].poPricelistId);
+ strPaymentMethod = (strIsSOTrx.equals("Y") ? data[0].finPaymentmethodId
+ : data[0].poPaymentmethodId);
}
StringBuffer resultado = new StringBuffer();
@@ -176,7 +178,8 @@
resultado.append("\n),");
resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentrule +
"\"),");
resultado.append("new Array(\"inpcPaymenttermId\", \"" + strPaymentterm +
"\"),");
- resultado.append("new Array(\"inpmPricelistId\", \"" + strPricelist +
"\")");
+ resultado.append("new Array(\"inpmPricelistId\", \"" + strPricelist +
"\"),");
+ resultado.append("new Array(\"inpfinPaymentmethodId\", \"" +
strPaymentMethod + "\")");
resultado.append(");");
xmlDocument.setParameter("array", resultado.toString());
response.setContentType("text/html; charset=UTF-8");
diff -r 32377e637a05 -r ff48f6570c57
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Thu May 12 00:45:35 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Wed May 11 18:07:12 2011 +0200
@@ -347,7 +347,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[($F{AMTACCTCR}!=BigDecimal.ZERO &&
$F{AMTACCTCR}!=null)?$P{NUMBERFORMAT}.format($F{AMTACCTCR}).toString():new
String(" ")]]></textFieldExpression>
+ <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$F{AMTACCTCR}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField-21"
stretchType="RelativeToBandHeight" x="350" y="0" width="80" height="13"/>
@@ -360,7 +360,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[($F{AMTACCTDR}!=BigDecimal.ZERO &&
$F{AMTACCTDR}!=null)?$P{NUMBERFORMAT}.format($F{AMTACCTDR}).toString():new
String(" ")]]></textFieldExpression>
+ <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$F{AMTACCTDR}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement key="textField-22"
stretchType="RelativeToBandHeight" x="280" y="0" width="70" height="13"/>
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
