details: /erp/devel/pi/rev/d7eaf56e7879
changeset: 8555:d7eaf56e7879
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Mon Oct 18 09:18:36 2010 +0200
summary: Fixed issue 0014550: Printable templates do not print Business
Partner information properly.
diffstat:
src/org/openbravo/erpReports/C_OrderJR.jrxml | 6 +++---
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 8 ++++----
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 7 ++++---
src/org/openbravo/erpReports/RptM_InOut.jrxml | 8 ++++----
4 files changed, 15 insertions(+), 14 deletions(-)
diffs (69 lines):
diff -r f9cd91d56af7 -r d7eaf56e7879
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Mon Oct 18 07:25:26
2010 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Mon Oct 18 09:18:36
2010 +0200
@@ -156,9 +156,9 @@
C_ORDER.DESCRIPTION, C_ORDER.DATEORDERED, C_ORDER.DOCUMENTNO AS ALBARAN,
C_BPARTNER.NAME2 || ' (' || C_BPARTNER.NAME || ')' AS COMPLETE_NAME,
AD_CLIENT.DESCRIPTION AS ENTITY,
C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS LOCATION,
AD_ORG.ad_org_id AS ORGANIZATIONID, C_ORDER.docstatus AS STATUS,
-(TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13)
END || TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN ''
ELSE CHR(13) END ||
-TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(POSTAL) || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER_LOCATION.PHONE) || CASE WHEN C_BPARTNER_LOCATION.PHONE IS
null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.FAX) ||
+(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 ||
+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_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, AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN,
AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM
AS PAYMENTTERM
FROM C_BPARTNER_LOCATION left join C_LOCATION L on
C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
diff -r f9cd91d56af7 -r d7eaf56e7879
src/org/openbravo/erpReports/RptC_Invoice.jrxml
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml Mon Oct 18 07:25:26
2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml Mon Oct 18 09:18:36
2010 +0200
@@ -211,10 +211,10 @@
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, (TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME
IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER.TAXID) ||
-CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(POSTAL) ||
-CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(C_BPARTNER_LOCATION.PHONE) || CASE WHEN C_BPARTNER_LOCATION.PHONE IS
null THEN '' ELSE CHR(13) END ||
-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
+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 ||
+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_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
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
LEFT JOIN C_BPARTNER_LOCATION ON C_INVOICE.C_BPARTNER_LOCATION_ID =
C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
diff -r f9cd91d56af7 -r d7eaf56e7879
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Mon Oct 18 07:25:26
2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Mon Oct 18 09:18:36
2010 +0200
@@ -210,9 +210,10 @@
DELIVERYRULE.NAME AS DELIVERYTERM, C_CURRENCY.ISO_CODE, PAYMENTTERM.TERM AS
PAYMENTTERM, (SELECT o.AD_ORG_ID FROM AD_ORG o JOIN AD_OrgType t USING
(AD_ORGTYPE_ID)
WHERE AD_ISORGINCLUDED(C_ORDER.ad_org_id, o.ad_org_id,
C_ORDER.ad_client_id)<>-1
AND (t.IsLegalEntity='Y' OR t.IsAcctLegalEntity='Y')) AS ORGANIZATIONID,
C_ORDER.docstatus AS STATUS,
-(TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13)
END || TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN ''
ELSE CHR(13) END ||
-TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(POSTAL) || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(C_BPARTNER_LOCATION.PHONE) ||
-CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(C_BPARTNER_LOCATION.FAX) || CASE WHEN C_BPARTNER_LOCATION.FAX IS null
THEN '' ELSE CHR(13) END) AS BP_DATA,
+(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 ||
+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_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,
AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN,
AD_ORG.NAME AS ORG_NAME
FROM C_ORDER left join C_BPARTNER_LOCATION on C_ORDER.BILLTO_ID =
C_BPARTNER_LOCATION.C_BPARTNER_ID
left join AD_USER on C_ORDER.AD_USER_ID = AD_USER.AD_USER_ID
diff -r f9cd91d56af7 -r d7eaf56e7879
src/org/openbravo/erpReports/RptM_InOut.jrxml
--- a/src/org/openbravo/erpReports/RptM_InOut.jrxml Mon Oct 18 07:25:26
2010 +0200
+++ b/src/org/openbravo/erpReports/RptM_InOut.jrxml Mon Oct 18 09:18:36
2010 +0200
@@ -186,10 +186,10 @@
C_REGION.NAME AS REGION, M_INOUT.DOCUMENTNO, M_INOUT.MOVEMENTDATE,
C_BPARTNER.VALUE AS PARTNER_VALUE, C_BPARTNER.TAXID,
MAX(C_ORDER.POREFERENCE) AS POREFERENCE, AD_CLIENT.DESCRIPTION AS ENTITY,
C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS ENTITY_LOCATION,
C_ORDER.DATEPROMISED, AD_ORGINFO.AD_ORG_ID AS ORGANIZATIONID,
M_INOUT.docstatus AS STATUS, C_BPARTNER.NAME AS BP_NAME, AD_ORG.NAME AS
ORG_NAME,
-AD_ORGINFO.TAXID AS ORG_TAXID,
C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION,
(TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13)
END ||
-TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE
CHR(13) END || TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE
CHR(13) END || TO_CHAR(POSTAL) ||
-CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
TO_CHAR(C_BPARTNER_LOCATION.PHONE) || CASE WHEN C_BPARTNER_LOCATION.PHONE IS
null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER_LOCATION.FAX) || CASE WHEN C_BPARTNER_LOCATION.FAX IS null
THEN '' ELSE CHR(13) END) AS BP_DATA,
+AD_ORGINFO.TAXID AS ORG_TAXID,
C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION,
(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 ||
+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_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
FROM C_BPARTNER_LOCATION right join M_INOUT on M_INOUT.C_BPARTNER_LOCATION_ID
= C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
left join C_LOCATION on
C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
