details: https://code.openbravo.com/erp/devel/pi/rev/970120b81d3c
changeset: 22059:970120b81d3c
user: Gaurav Deshmukh <gaurav.deshmukh <at> openbravo.com>
date: Fri Feb 14 13:23:28 2014 +0530
summary: Fixes Issue 25549:Invoice -double lines printed when Contract
modules are installed
diffstat:
src/org/openbravo/erpReports/RptC_Invoice_new.jrxml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r e626ffeb97fa -r 970120b81d3c
src/org/openbravo/erpReports/RptC_Invoice_new.jrxml
--- a/src/org/openbravo/erpReports/RptC_Invoice_new.jrxml Tue Feb 18
12:05:12 2014 +0100
+++ b/src/org/openbravo/erpReports/RptC_Invoice_new.jrxml Fri Feb 14
13:23:28 2014 +0530
@@ -60,6 +60,9 @@
<parameter name="LOCALE" class="java.util.Locale"
isForPrompting="false"/>
<parameter name="SUBREP_RptC_Invoice_Lines_new"
class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
<parameter name="SUBREP_RptC_Invoice_TaxLines_new"
class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
+ <parameter name="SHOW_LOGO" class="java.lang.String"/>
+ <parameter name="SHOW_COMPANYDATA" class="java.lang.String"
isForPrompting="false"/>
+ <parameter name="HEADER_MARGIN" class="java.lang.String"/>
<queryString>
<![CDATA[SELECT C_INVOICE.C_INVOICE_ID, C_BPARTNER.NAME,
C_BPARTNER.TAXID AS CIF, AD_USER.NAME AS CONTACT_NAME, C_LOCATION.ADDRESS1,
C_LOCATION.POSTAL, C_LOCATION.CITY, C_REGION.NAME AS REGION,C_COUNTRY.NAME AS
COUNTRY,C_BPARTNER_LOCATION.PHONE AS PHONE, C_BPARTNER_LOCATION.FAX AS FAX,
@@ -70,7 +73,7 @@
COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE
CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN
'' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_LOCATION.CITY), '') || CASE WHEN C_LOCATION.CITY IS null
THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_COUNTRY.NAME), '') || CASE WHEN
C_COUNTRY.NAME IS null THEN '' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN
C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
-CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS
BP_DATA, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN, ISSOTRX,
+CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS
BP_DATA, $P{SHOW_LOGO} AS SHOWLOGO, $P{SHOW_COMPANYDATA} AS SHOWCOMPANYDATA,
$P{HEADER_MARGIN} AS HEADERMARGIN, ISSOTRX,
M_PRICELIST.ISTAXINCLUDED, C_INVOICE.ISCASHVAT
FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID =
C_BPARTNER.C_BPARTNER_ID
LEFT JOIN AD_USER ON C_INVOICE.AD_USER_ID = AD_USER.AD_USER_ID
@@ -80,7 +83,7 @@
LEFT JOIN C_COUNTRY ON C_LOCATION.C_COUNTRY_ID = C_COUNTRY.C_COUNTRY_ID
LEFT JOIN C_PAYMENTTERM ON C_INVOICE.C_PAYMENTTERM_ID =
C_PAYMENTTERM.C_PAYMENTTERM_ID
LEFT JOIN C_CURRENCY ON C_INVOICE.C_CURRENCY_ID =
C_CURRENCY.C_CURRENCY_ID
- LEFT JOIN C_POC_DOCTYPE_TEMPLATE ON
C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_INVOICE.C_DOCTYPETARGET_ID,
+,
AD_ORGINFO, AD_CLIENT, AD_ORG, M_PRICELIST
WHERE C_INVOICE.ad_client_id = AD_CLIENT.ad_client_id
AND C_INVOICE.M_PRICELIST_ID = M_PRICELIST.M_PRICELIST_ID
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
