details: /erp/devel/int/rev/fe3ebc91f201
changeset: 7117:fe3ebc91f201
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Thu Apr 22 18:54:05 2010 +0530
summary: Fixes Issue 12743: Withholding Report in PDF fails
details: /erp/devel/int/rev/ec07533734ac
changeset: 7118:ec07533734ac
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 15:27:21 2010 +0200
summary: issue 13068: Make process mehtods private
diffstat:
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml |
2 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html |
12 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java |
62 +++++++--
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml |
24 +--
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification_data.xsql |
9 +-
5 files changed, 61 insertions(+), 48 deletions(-)
diffs (265 lines):
diff -r 717afc06700f -r ec07533734ac
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml
--- a/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml Thu Apr
22 13:11:30 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml Thu Apr
22 15:27:21 2010 +0200
@@ -49,7 +49,7 @@
}
<FIELDS_TMP id="sectionDetailProcess">
- void process<FIELD_TMP
id="fieldProcessMethodId">xx</FIELD_TMP>(HttpServletResponse response,
VariablesSecureApp vars, String strTabId, String windowId) throws IOException,
ServletException {
+ private void process<FIELD_TMP
id="fieldProcessMethodId">xx</FIELD_TMP>(HttpServletResponse response,
VariablesSecureApp vars, String strTabId, String windowId) throws IOException,
ServletException {
String resultField;
String command = vars.getStringParameter("Command", "DEFAULT");
XmlDocument xmlDocument =
xmlEngine.readXmlTemplate("org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
diff -r 717afc06700f -r ec07533734ac
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Thu Apr 22 13:11:30 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Thu Apr 22 15:27:21 2010 +0200
@@ -53,8 +53,8 @@
<script language="JavaScript" type="text/javascript">
function imprimir()
{
- /* var frm = document.frmMain;
- markCheckedAllElements(frm.inpcBPartnerId_IN); */
+ var frm = document.frmMain;
+ markCheckedAllElements(frm.inpcBPartnerId_IN);
openPDFFiltered("ReportAnnualCertification.pdf?Command=PDF","PDF");
return true;
}
@@ -69,11 +69,7 @@
setWindowElementFocus(frm.inpDateTo);
showJSMessage(7);
return false;
- } else if (inputValue(frm.inpOrg)==null || inputValue(frm.inpOrg)=="") {
- setWindowElementFocus(frm.inpOrg);
- showJSMessage(7);
- return false;
- }
+ }
markCheckedAllElements(frm.inpcBPartnerId_IN);
return true;
}</script>
@@ -264,7 +260,7 @@
<tr>
<td class="TitleCell"><span
class="LabelText">Organization</span></td>
<td class="Combo_ContentCell">
- <select name="inpOrg" id="inpOrg" class="ComboKey
Combo_OneCell_width" required="true">
+ <select name="inpOrg" id="inpOrg" class="Combo
Combo_OneCell_width" required="false">
<option value=""> <div id="reportAD_ORGID"></div></option>
</select></td>
<td class="ContentCell"></td>
diff -r 717afc06700f -r ec07533734ac
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Thu Apr 22 13:11:30 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Thu Apr 22 15:27:21 2010 +0200
@@ -29,8 +29,8 @@
import org.openbravo.base.filter.IsIDFilter;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
+import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.DateTimeData;
import org.openbravo.erpCommon.utility.LeftTabsBar;
import org.openbravo.erpCommon.utility.NavigationBar;
@@ -240,9 +240,17 @@
}
// PARAMETRI UTENTE
xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2));
- // Organization * is not shown
- xmlDocument.setData("reportAD_ORGID", "liststructure",
OrganizationComboData.selectCombo(this,
- vars.getRole()));
+ try {
+ // AD_OrgType_BU_LE
+ ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "AD_ORG_ID", "",
+ "AD_OrgType_BU_LE", Utility.getContext(this, vars,
"#AccessibleOrgTree",
+ "ReportAnnualCertification"), Utility.getContext(this, vars,
"#User_Client",
+ "ReportAnnualCertification"), '*');
+ comboTableData.fillParameters(null, "ReportAnnualCertification", "");
+ xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
+ } catch (Exception ex) {
+ throw new ServletException(ex);
+ }
xmlDocument.setParameter("adOrgId", strOrg);
xmlDocument.setParameter("dateFrom", strDateFrom);
xmlDocument.setParameter("dateFromdisplayFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
@@ -256,9 +264,8 @@
data = ReportAnnualCertificationData.set();
} else {
data = ReportAnnualCertificationData.select(this,
Utility.getContext(this, vars,
- "#User_Client", "ReportAnnualCertification"),
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "ReportAnnualCertification"), strDateFrom,
DateTimeData.nDaysAfter(
- this, strDateTo, "1"), strcBpartnerId, initRecordNumber,
intRecordRange);
+ "#User_Client", "ReportAnnualCertification"), strOrg, strDateFrom,
DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strcBpartnerId, initRecordNumber,
intRecordRange);
}
xmlDocument.setData("structure1", data);
@@ -286,30 +293,49 @@
log4j.debug("Output: PDF");
ReportAnnualCertificationData[] data = null;
- if (!strDateFrom.equals("") && !strDateTo.equals("") &&
!strOrg.equals("")) {
+ if (!strDateFrom.equals("") && !strDateTo.equals("")) {
data = ReportAnnualCertificationData.select(this,
Utility.getContext(this, vars,
- "#User_Client", "ReportAnnualCertification"),
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "ReportAnnualCertification"), strDateFrom,
DateTimeData.nDaysAfter(
- this, strDateTo, "1"), strcBpartnerId);
+ "#User_Client", "ReportAnnualCertification"), strOrg, strDateFrom,
DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strcBpartnerId);
} else {
advisePopUp(request, response, "WARNING", Utility.messageBD(this,
"NoDataFound", vars
.getLanguage()));
}
String sClientID = vars.getUserClient();
- String sOrganID = "'" + strOrg + "'";
+ String sOrganID = "";
+ if (strOrg.equals("")) {
+ for (int i = 0; i < data.length; i++) {
+ sOrganID = sOrganID + "'" + data[i].orgid;
+ if (!(i == data.length - 1)) {
+ sOrganID = sOrganID + "',";
+ } else {
+ sOrganID = sOrganID + "'";
+ }
+ }
+
+ } else {
+ sOrganID = "'" + strOrg + "'";
+ }
OrganizationData[] dataOrganization = OrganizationData.select(this,
vars.getLanguage(),
sClientID, sOrganID);
String strOutput = vars.commandIn("PDF") ? "pdf" : "xls";
String strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml";
-
+ // put address of organization and employer into same data
+ for (int i = 0; i < data.length; i++) {
+ if (dataOrganization != null && dataOrganization.length > 0) {
+ for (int j = 0; j < dataOrganization.length; j++) {
+ if (data[i].orgid.equals(dataOrganization[j].adOrgId)) {
+ data[i].mittente = dataOrganization[j].adClientIdr;
+ data[i].erogante = dataOrganization[j].adClientIdr;
+ data[i].addressorganization = dataOrganization[j].cLocationIdr;
+ break;
+ }
+ }
+ }
+ }
HashMap<String, Object> parameters = new HashMap<String, Object>();
- if (dataOrganization != null && dataOrganization.length > 0) {
- parameters.put("Mittente", dataOrganization[0].adClientIdr);
- parameters.put("Erogante", dataOrganization[0].adClientIdr);
- parameters.put("AddressOrganization", dataOrganization[0].cLocationIdr);
- }
parameters.put("DateFrom", strDateFrom);
parameters.put("DateTo", strDateTo);
renderJR(vars, response, strReportName, strOutput, parameters, data, null);
diff -r 717afc06700f -r ec07533734ac
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml
Thu Apr 22 13:11:30 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml
Thu Apr 22 15:27:21 2010 +0200
@@ -23,14 +23,6 @@
<import value="net.sf.jasperreports.engine.*" />
<import value="net.sf.jasperreports.engine.data.*" />
- <parameter name="Mittente" isForPrompting="false"
class="java.lang.String">
-
<parameterDescription><![CDATA[Mittente]]></parameterDescription>
- <defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
- </parameter>
- <parameter name="Erogante" isForPrompting="false"
class="java.lang.String">
-
<parameterDescription><![CDATA[Erogante]]></parameterDescription>
- <defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
- </parameter>
<parameter name="DateFrom" isForPrompting="false"
class="java.lang.String">
<parameterDescription><![CDATA[Date
From]]></parameterDescription>
<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
@@ -39,15 +31,11 @@
<parameterDescription><![CDATA[Date To]]></parameterDescription>
<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
</parameter>
- <parameter name="AddressOrganization" isForPrompting="false"
class="java.lang.String">
- <parameterDescription><![CDATA[Address
Organization]]></parameterDescription>
- <defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
- </parameter>
<parameter name="DATEFORMATTER" isForPrompting="false"
class="java.text.DateFormat">
<defaultValueExpression
><![CDATA[$P{REPORT_FORMAT_FACTORY}.createDateFormat("", $P{REPORT_LOCALE},
$P{REPORT_TIME_ZONE})]]></defaultValueExpression>
</parameter>
<parameter name="LOCALE" isForPrompting="false"
class="java.util.Locale"/>
- <queryString><![CDATA[SELECT buspar.name as
BusinessPartner,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME
as City,City.LOCODE,
+ <queryString><![CDATA[SELECT '' as Mittente, '' as Erogante,'' as
AddressOrganization, buspar.name as
BusinessPartner,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME
as City,City.LOCODE,
debpaycancel.DATEPLANNED,bank.Name,bank.Codebank,bank.Codebranch,bank.Digitcontrol
as DigitcontrolBank,bankaccount.Digitcontrol as
DigitcontrolBankAccount,bankaccount.Codeaccount,
coalesce ( sum(invoic.TOTALLINES),0) as SummedLineAmount,
coalesce ( sum(invoic.GRANDTOTAL),0) as GrandTotalAmount,
@@ -76,7 +64,9 @@
left join (select C_Bank_ID, Name, Codebank, Codebranch, Digitcontrol from
C_Bank) bank on (bank.C_Bank_ID = bankaccount.C_Bank_ID)
group by
buspar.name,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME,City.LOCODE
,debpaycancel.DATEPLANNED,bank.Name,bank.Codebank,bank.Codebranch,bank.Digitcontrol,bankaccount.Digitcontrol,bankaccount.Codeaccount
order by buspar.name asc]]></queryString>
-
+ <field name="MITTENTE" class="java.lang.String"/>
+ <field name="EROGANTE" class="java.lang.String"/>
+ <field name="ADDRESSORGANIZATION" class="java.lang.String"/>
<field name="BUSINESSPARTNER" class="java.lang.String"/>
<field name="TAXID" class="java.lang.String"/>
<field name="FISCALCODE" class="java.lang.String"/>
@@ -157,7 +147,7 @@
<textElement>
<font fontName="Courier New"
size="10"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$P{AddressOrganization}+ " " +
$P{DATEFORMATTER}.format(new Date())]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($F{ADDRESSORGANIZATION}!=null)?$F{ADDRESSORGANIZATION}:new
String(" ")+ " " + $P{DATEFORMATTER}.format(new
Date())]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
@@ -442,7 +432,7 @@
<textElement>
<font fontName="Courier New"/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$P{Mittente}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{MITTENTE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
@@ -459,7 +449,7 @@
<textElement>
<font/>
</textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$P{Erogante}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{EROGANTE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
diff -r 717afc06700f -r ec07533734ac
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification_data.xsql
Thu Apr 22 13:11:30 2010 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification_data.xsql
Thu Apr 22 15:27:21 2010 +0200
@@ -28,7 +28,7 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT buspar.name as
BusinessPartner,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME
as City,City.LOCODE,
+ SELECT '' as Mittente, '' as Erogante,'' as AddressOrganization,buspar.name
as BusinessPartner,org.AD_ORG_ID as
OrgID,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME as
City,City.LOCODE,
debpaycancel.DATEPLANNED,bank.Name,bank.Codebank,bank.Codebranch,bank.Digitcontrol
as DigitcontrolBank,bankaccount.Digitcontrol as
DigitcontrolBankAccount,bankaccount.Codeaccount,
coalesce ( sum(invoic.TOTALLINES),0) as SummedLineAmount,
coalesce ( sum(invoic.GRANDTOTAL),0) as GrandTotalAmount,
@@ -36,7 +36,7 @@
FROM
(select * from C_INVOICE where ISACTIVE='Y'
and AD_Client_ID IN ('1')
- and AD_ORG_ID IN ('1')
+ AND 3=3
) invoic
join (select * from C_DEBT_PAYMENT_CANCEL where ISACTIVE='Y'
AND 1=1
@@ -53,12 +53,13 @@
left join (select C_CITY_ID,NAME,LOCODE from C_CITY where ISACTIVE='Y' ) City
on Loc.C_CITY_ID=City.C_CITY_ID
left join (select C_BankAccount_ID, C_Bank_ID, Digitcontrol, Codeaccount from
C_BankAccount) bankaccount on (debpaygenerate.C_BankAccount_ID =
bankaccount.C_BankAccount_ID)
left join (select C_Bank_ID, Name, Codebank, Codebranch, Digitcontrol from
C_Bank) bank on (bank.C_Bank_ID = bankaccount.C_Bank_ID)
- group by
buspar.name,buspar.taxid,buspar.fiscalcode,Loc.ADDRESS1,Loc.POSTAL,City.NAME,City.LOCODE
,debpaycancel.DATEPLANNED,bank.Name,bank.Codebank,bank.Codebranch,bank.Digitcontrol,bankaccount.Digitcontrol,bankaccount.Codeaccount
+ left join (select AD_ORG_ID from AD_ORG) org on (org.AD_ORG_ID =
invoic.AD_ORG_ID)
+ group by
buspar.name,buspar.taxid,buspar.fiscalcode,org.AD_ORG_ID,Loc.ADDRESS1,Loc.POSTAL,City.NAME,City.LOCODE
,debpaycancel.DATEPLANNED,bank.Name,bank.Codebank,bank.Codebranch,bank.Digitcontrol,bankaccount.Digitcontrol,bankaccount.Codeaccount
order by buspar.name asc
]]></Sql>
<Field name="rownum" value="count"/>
<Parameter name="adUserClient" type="replace" optional="true" after="and
AD_Client_ID IN (" text="'1'"/>
- <Parameter name="adUserOrg" type="replace" optional="true" after="and
AD_ORG_ID IN (" text="'1'"/>
+ <Parameter name="adUserOrg" optional="true" after="AND 3=3"><![CDATA[ AND
AD_ORG_ID IN(?)]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 1=1"><![CDATA[AND
DATEPLANNED >= to_date(?) ]]></Parameter>
<Parameter name="parDateTo" optional="true" after="AND 1=1"><![CDATA[AND
DATEPLANNED < to_date(?) ]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
2=2"><![CDATA[ AND C_BPARTNER_ID IN]]></Parameter>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
