details:   https://code.openbravo.com/erp/devel/pi/rev/a8628d0d3e00
changeset: 15767:a8628d0d3e00
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Mar 07 18:31:46 2012 +0100
summary:   Fixes issue 0019967: Changed join sentece in query.

details:   https://code.openbravo.com/erp/devel/pi/rev/bd164e456436
changeset: 15768:bd164e456436
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Mar 07 18:30:38 2012 +0100
summary:   Fixes issue 16852: Changed join sentence in SQL query.

diffstat:

 src/org/openbravo/erpReports/C_OrderJR.jrxml    |  5 ++++-
 src/org/openbravo/erpReports/RptC_Invoice.jrxml |  9 ++++++---
 src/org/openbravo/erpReports/RptC_OrderPO.jrxml |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 66dab2eb86a2 -r bd164e456436 
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml      Tue Mar 06 11:28:18 
2012 +0100
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml      Wed Mar 07 18:30:38 
2012 +0100
@@ -2,6 +2,9 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports 
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="C_OrderJR" 
pageWidth="595" pageHeight="842" columnWidth="483" leftMargin="56" 
rightMargin="56" topMargin="56" bottomMargin="56">
        <property name="ireport.scriptlethandling" value="0"/>
        <property name="ireport.encoding" value="UTF-8"/>
+       <property name="ireport.zoom" value="1.0"/>
+       <property name="ireport.x" value="0"/>
+       <property name="ireport.y" value="0"/>
        <import value="net.sf.jasperreports.engine.*"/>
        <import value="java.util.*"/>
        <import value="net.sf.jasperreports.engine.data.*"/>
@@ -78,7 +81,7 @@
                         left join C_COUNTRY CO ON L.C_COUNTRY_ID = 
CO.C_COUNTRY_ID
                         left join  C_REGION R on L.C_REGION_ID = R.C_REGION_ID,
      AD_USER right join C_ORDER on AD_USER.AD_USER_ID = C_ORDER.AD_USER_ID
-                         left join C_POC_DOCTYPE_TEMPLATE ON 
C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_ORDER.C_DOCTYPE_ID,
+                         left join C_POC_DOCTYPE_TEMPLATE ON 
C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_ORDER.C_DOCTYPETARGET_ID,
 C_BPARTNER, AD_ORGINFO, AD_CLIENT, AD_ORG,
    (SELECT VALUE, NAME
     FROM AD_REF_LIST_V
diff -r 66dab2eb86a2 -r bd164e456436 
src/org/openbravo/erpReports/RptC_Invoice.jrxml
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml   Tue Mar 06 11:28:18 
2012 +0100
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml   Wed Mar 07 18:30:38 
2012 +0100
@@ -2,6 +2,9 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports 
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="RptC_Invoice" 
pageWidth="595" pageHeight="842" columnWidth="483" leftMargin="56" 
rightMargin="56" topMargin="56" bottomMargin="56">
        <property name="ireport.scriptlethandling" value="0"/>
        <property name="ireport.encoding" value="UTF-8"/>
+       <property name="ireport.zoom" value="1.0"/>
+       <property name="ireport.x" value="0"/>
+       <property name="ireport.y" value="0"/>
        <import value="net.sf.jasperreports.engine.*"/>
        <import value="java.util.*"/>
        <import value="net.sf.jasperreports.engine.data.*"/>
@@ -58,9 +61,9 @@
        <parameter name="SUBREP_RptC_Invoice_Lines" 
class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
        <parameter name="SUBREP_RptC_Invoice_TaxLines" 
class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
        <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, 
+               <![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,
-C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS 
CODE_BPARTNER, 
+C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS 
CODE_BPARTNER,
 AD_CLIENT.DESCRIPTION AS ENTITY, 
C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, 
C_CURRENCY.ISO_CODE AS CURRENCY_CODE,C_CURRENCY.CURSYMBOL AS SYMBOL,
 C_PAYMENTTERM.NAME AS PAYTERM, AD_ORGINFO.ad_org_id AS ORGANIZATIONID, 
C_INVOICE.docstatus AS STATUS, AD_ORG.NAME AS ORG_NAME, AD_ORGINFO.TAXID AS 
ORG_TAXID,
 C_BPARTNER.TAXID AS BP_TAXID, (COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE 
WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || 
COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null 
THEN '' ELSE CHR(13) END ||
@@ -76,7 +79,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_DOCTYPE_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
 WHERE C_INVOICE.ad_client_id = AD_CLIENT.ad_client_id
 AND C_INVOICE.C_INVOICE_ID IN ($P{DOCUMENT_ID})
diff -r 66dab2eb86a2 -r bd164e456436 
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml   Tue Mar 06 11:28:18 
2012 +0100
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml   Wed Mar 07 18:30:38 
2012 +0100
@@ -81,7 +81,7 @@
               left join AD_USER on C_ORDER.AD_USER_ID = AD_USER.AD_USER_ID
               left join C_LOCATION ON C_BPARTNER_LOCATION.C_LOCATION_ID = 
C_LOCATION.C_LOCATION_ID
               left join C_COUNTRY ON C_LOCATION.C_COUNTRY_ID = 
C_COUNTRY.C_COUNTRY_ID
-              left join C_POC_DOCTYPE_TEMPLATE ON 
C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_ORDER.C_DOCTYPE_ID,
+              left join C_POC_DOCTYPE_TEMPLATE ON 
C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_ORDER.C_DOCTYPETARGET_ID,
 C_BPARTNER, AD_ORGINFO, AD_CLIENT, C_CURRENCY, AD_ORG,
    (SELECT VALUE, NAME
     FROM AD_REF_LIST_V

------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to