details: /erp/devel/main/rev/b24369288d99
changeset: 8427:b24369288d99
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Wed Sep 15 09:57:14 2010 +0200
summary: Fixes issue 0014550: Printable templates do not print information
properly.
details: /erp/devel/main/rev/b8eaf9d003ec
changeset: 8428:b8eaf9d003ec
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Sep 16 02:47:19 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 2 +-
src/org/openbravo/erpReports/C_OrderJR.jrxml | 10 ++++++----
src/org/openbravo/erpReports/RptC_Invoice.jrxml | 7 ++++---
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 5 +++--
src/org/openbravo/erpReports/RptM_InOut.jrxml | 7 ++++---
5 files changed, 18 insertions(+), 13 deletions(-)
diffs (81 lines):
diff -r 2691c857479e -r b8eaf9d003ec src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Sep 15 17:02:21 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 16 02:47:19 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18350]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18427]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
diff -r 2691c857479e -r b8eaf9d003ec
src/org/openbravo/erpReports/C_OrderJR.jrxml
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml Wed Sep 15 17:02:21
2010 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml Thu Sep 16 02:47:19
2010 +0000
@@ -155,10 +155,12 @@
C_BPARTNER_LOCATION.PHONE,C_BPARTNER_LOCATION.FAX,C_BPARTNER.URL,
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,
C_ORDER.ad_org_id AS ORGANIZATIONID, C_ORDER.docstatus AS STATUS,
-(COALESCE(TO_CHAR(AD_USER.NAME) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '\n','') || COALESCE(TO_CHAR(ADDRESS1) ||
'\n','')
-|| COALESCE(TO_CHAR(POSTAL) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '\n','')) 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
+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) ||
+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
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
diff -r 2691c857479e -r b8eaf9d003ec
src/org/openbravo/erpReports/RptC_Invoice.jrxml
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml Wed Sep 15 17:02:21
2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml Thu Sep 16 02:47:19
2010 +0000
@@ -211,9 +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, (COALESCE(TO_CHAR(AD_USER.NAME) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '\n','') || COALESCE(TO_CHAR(ADDRESS1) ||
'\n','')
-|| COALESCE(TO_CHAR(POSTAL) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '\n','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '\n','')) AS BP_DATA,
-SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN
+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
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 2691c857479e -r b8eaf9d003ec
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Wed Sep 15 17:02:21
2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Thu Sep 16 02:47:19
2010 +0000
@@ -210,8 +210,9 @@
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,
-(COALESCE(TO_CHAR(AD_USER.NAME) || '','') ||
COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '','') || COALESCE(TO_CHAR(ADDRESS1) ||
'','')
-|| COALESCE(TO_CHAR(POSTAL) || '','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '','')) AS BP_DATA,
+(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, 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 2691c857479e -r b8eaf9d003ec
src/org/openbravo/erpReports/RptM_InOut.jrxml
--- a/src/org/openbravo/erpReports/RptM_InOut.jrxml Wed Sep 15 17:02:21
2010 +0200
+++ b/src/org/openbravo/erpReports/RptM_InOut.jrxml Thu Sep 16 02:47:19
2010 +0000
@@ -186,9 +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,
(COALESCE(TO_CHAR(AD_USER.NAME) || '','') ||
-COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '','') || COALESCE(TO_CHAR(ADDRESS1) ||
'','') || COALESCE(TO_CHAR(POSTAL) || '','') ||
-COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '','') ||
COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '','')) AS BP_DATA,
+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,
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
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
