Fixes bug 0005211 Converted 'cCounrtyId' parameter to 'String' in 'ReportTaxInvoice' reports.
authorRafa Roda Palacios <rafael.roda@openbravo.com>
Mon, 29 Sep 2008 10:27:59 +0000
changeset 1727 cc39bbf87d15
parent 1726 f5b60e227b56
child 1728 70c04ecb0306
Fixes bug 0005211 Converted 'cCounrtyId' parameter to 'String' in 'ReportTaxInvoice' reports.
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.jrxml	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.jrxml	Mon Sep 29 10:27:59 2008 +0000
@@ -196,8 +196,8 @@
 	<parameter name="SUBREPORT_DIR" isForPrompting="true" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[$P{BASE_DESIGN}+"/org/openbravo/erpCommon/ad_reports/"]]></defaultValueExpression>
 	</parameter>
-	<parameter name="cCountryId" isForPrompting="true" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(100)]]></defaultValueExpression>
+	<parameter name="cCountryId" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["100"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="parDateFrom" isForPrompting="true" class="java.util.Date"/>
 	<parameter name="parDateTo" isForPrompting="true" class="java.util.Date"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Mon Sep 29 10:27:59 2008 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2001-2006 Openbravo SL
+ * All portions are Copyright (C) 2001-2008 Openbravo SL
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -111,7 +111,7 @@
     HashMap<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("REPORT_TITLE", classInfo.name);
     parameters.put("DETAIL", strDetail.equals("-1")?"Y":"N");
-    parameters.put("cCountryId", new Integer(Utility.getContext(this, vars, "C_Country_Id", "ReportTaxInvoiceJR")));
+    parameters.put("cCountryId", new String(Utility.getContext(this, vars, "C_Country_Id", "ReportTaxInvoiceJR")));
     parameters.put("SALE", strSale);
     parameters.put("PURCHASE", strPurchase);
     parameters.put("PARAM_ORG", Tree.getMembers(this, TreeData.getTreeOrg(this, vars.getClient()), strOrg));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml	Mon Sep 29 10:27:59 2008 +0000
@@ -138,8 +138,8 @@
 	<parameter name="aux_org" isForPrompting="false" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[$P{USER_ORG}.equals("") ? "" : " AND C_INVOICE.AD_ORG_ID IN ("+$P{USER_ORG}+") "]]></defaultValueExpression>
 	</parameter>
-	<parameter name="cCountryId" isForPrompting="true" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(100)]]></defaultValueExpression>
+	<parameter name="cCountryId" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["100"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="parDateFrom" isForPrompting="true" class="java.util.Date"/>
 	<parameter name="parDateTo" isForPrompting="true" class="java.util.Date"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml	Mon Sep 29 10:27:59 2008 +0000
@@ -135,8 +135,8 @@
 	<parameter name="aux_org" isForPrompting="false" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[$P{USER_ORG}.equals("") ? "" : " AND C_INVOICE.AD_ORG_ID IN ("+$P{USER_ORG}+") "]]></defaultValueExpression>
 	</parameter>
-	<parameter name="cCountryId" isForPrompting="true" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(100)]]></defaultValueExpression>
+	<parameter name="cCountryId" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["100"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="parDateFrom" isForPrompting="true" class="java.util.Date"/>
 	<parameter name="parDateTo" isForPrompting="true" class="java.util.Date"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml	Mon Sep 29 10:27:59 2008 +0000
@@ -135,8 +135,8 @@
 	<parameter name="aux_org" isForPrompting="false" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[$P{USER_ORG}.equals("") ? " " : " AND C_INVOICE.AD_ORG_ID IN ("+$P{USER_ORG}+") "]]></defaultValueExpression>
 	</parameter>
-	<parameter name="cCountryId" isForPrompting="true" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(100)]]></defaultValueExpression>
+	<parameter name="cCountryId" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["100"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="parDateFrom" isForPrompting="true" class="java.util.Date"/>
 	<parameter name="parDateTo" isForPrompting="true" class="java.util.Date"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml	Mon Sep 29 08:45:57 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml	Mon Sep 29 10:27:59 2008 +0000
@@ -138,8 +138,8 @@
 	<parameter name="aux_org" isForPrompting="false" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[$P{USER_ORG}.equals("") ? "" : " AND C_INVOICE.AD_ORG_ID IN ("+$P{USER_ORG}+") "]]></defaultValueExpression>
 	</parameter>
-	<parameter name="cCountryId" isForPrompting="true" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(100)]]></defaultValueExpression>
+	<parameter name="cCountryId" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["100"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="parDateFrom" isForPrompting="true" class="java.util.Date"/>
 	<parameter name="parDateTo" isForPrompting="true" class="java.util.Date"/>