details: https://code.openbravo.com/erp/devel/pi/rev/5e3c784a43d5
changeset: 22993:5e3c784a43d5
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed May 07 19:50:39 2014 +0200
summary: Fixes bug 26155: Document no field in orders awaiting invoice report
diffstat:
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml
| 1496 +++------
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.jrxml
| 17
+-
2 files changed, 526 insertions(+), 987 deletions(-)
diffs (truncated from 1626 to 300 lines):
diff -r 7a661836e9a4 -r 5e3c784a43d5
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml
---
a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml
Wed May 07 16:08:57 2014 +0000
+++
b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml
Wed May 07 19:50:39 2014 +0200
@@ -1,130 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN"
"http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";>
-<jasperReport
- name="ReportOrderNotShipped"
- columnCount="1"
- printOrder="Vertical"
- orientation="Portrait"
- pageWidth="842"
- pageHeight="595"
- columnWidth="782"
- columnSpacing="0"
- leftMargin="30"
- rightMargin="30"
- topMargin="20"
- bottomMargin="20"
- whenNoDataType="NoPages"
- isTitleNewPage="false"
- isSummaryNewPage="false">
- <property name="ireport.scriptlethandling" value="0" />
- <property name="ireport.encoding" value="UTF-8" />
- <import value="java.util.*" />
- <import value="net.sf.jasperreports.engine.*" />
- <import value="net.sf.jasperreports.engine.data.*" />
-
- <style
- name="default"
- isDefault="false"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="10"
- >
+<?xml version="1.0" encoding="UTF-8"?>
+<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="ReportOrderNotShipped" pageWidth="842" pageHeight="595" columnWidth="782"
leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+ <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.*"/>
+ <style name="default" vAlign="Middle" fontName="Bitstream Vera Sans"
fontSize="10"/>
+ <style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18">
+ <box leftPadding="5"/>
</style>
- <style
- name="Report_Title"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="18"
- >
- <box leftPadding="5"></box>
+ <style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream
Vera Sans" fontSize="14">
+ <box leftPadding="5"/>
</style>
- <style
- name="Report_Subtitle"
- isDefault="false"
- forecolor="#555555"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- <box leftPadding="5"></box>
+ <style name="Total_Field" mode="Opaque" forecolor="#000000"
backcolor="#CCCCCC" vAlign="Middle">
+ <box leftPadding="5"/>
</style>
- <style
- name="Total_Field"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- vAlign="Middle"
- >
- <box leftPadding="5"></box>
+ <style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF"
backcolor="#555555" vAlign="Middle">
+ <box leftPadding="5">
+ <leftPen lineWidth="1.0" lineStyle="Solid"
lineColor="#FFFFFF"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid"
lineColor="#FFFFFF"/>
+ </box>
</style>
- <style
- name="Detail_Header"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- >
- <box leftPadding="5">
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
- <rightPen lineWidth="1.0"
lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
+ <style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF"
backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans"
fontSize="14">
+ <box leftPadding="5"/>
</style>
- <style
- name="GroupHeader_DarkGray"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="GroupHeader_Gray"
- isDefault="false"
- mode="Opaque"
- backcolor="#999999"
- >
- </style>
- <style
- name="Detail_Task"
- isDefault="false"
- >
-
+ <style name="GroupHeader_Gray" mode="Opaque" backcolor="#999999"/>
+ <style name="Detail_Task">
<conditionalStyle>
<conditionExpression><![CDATA[new
Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
- <style
- name="Detail_Task"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- >
- </style>
+ <style mode="Opaque" backcolor="#CCCCCC"/>
</conditionalStyle>
</style>
- <style
- name="Total_Gray"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- >
- </style>
-
- <parameter name="REPORT_TITLE" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="REPORT_SUBTITLE" isForPrompting="false"
class="java.lang.String"/>
- <queryString><![CDATA[SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME,
-O.DOCUMENTNO, O.POREFERENCE, TO_DATE(O.DATEORDERED) AS DATEORDERED,
TO_DATE(O.DATEPROMISED) AS DATEPROMISED,
+ <style name="Total_Gray" mode="Opaque" forecolor="#000000"
backcolor="#CCCCCC"/>
+ <parameter name="REPORT_TITLE" class="java.lang.String"
isForPrompting="false"/>
+ <parameter name="REPORT_SUBTITLE" class="java.lang.String"
isForPrompting="false"/>
+ <queryString>
+ <![CDATA[SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME,
+O.DOCUMENTNO, O.POREFERENCE, TO_DATE(O.DATEORDERED) AS DATEORDERED,
TO_DATE(O.DATEPROMISED) AS DATEPROMISED,
REFLISTV.NAME AS DELIVERYRULE, COALESCE(DLOC.NAME, BPADD.NAME) AS
DELIVERYLOCATION,
PR.NAME || ' ' || COALESCE(TO_CHAR(ASI.DESCRIPTION), '') AS PRODNAME,
OL.M_ATTRIBUTESETINSTANCE_ID,
-OL.QTYORDERED || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS ORDEREDQTY,
-(OL.QTYORDERED-OL.QTYDELIVERED) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '')
AS PENDINGQTY,
+OL.QTYORDERED || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS ORDEREDQTY,
+(OL.QTYORDERED-OL.QTYDELIVERED) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '')
AS PENDINGQTY,
SUM(SD.QTYONHAND) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS QTYINSTOCK
-FROM AD_ORG ORG, C_BPARTNER BP, C_BPARTNER_LOCATION BPADD,
-M_PRODUCT PR, C_UOM UO,
+FROM AD_ORG ORG, C_BPARTNER BP, C_BPARTNER_LOCATION BPADD,
+M_PRODUCT PR, C_UOM UO,
C_ORDER O
LEFT JOIN AD_REF_LIST_V REFLISTV
ON REFLISTV.VALUE = O.DELIVERYRULE
@@ -161,8 +83,8 @@
GROUP BY ORG.NAME, BP.NAME, O.DOCUMENTNO, O.POREFERENCE, O.DATEORDERED,
O.DATEPROMISED,
REFLISTV.NAME, DLOC.NAME, BPADD.NAME, PR.NAME, ASI.DESCRIPTION,
OL.M_ATTRIBUTESETINSTANCE_ID,
OL.QTYORDERED, UO.UOMSYMBOL, OL.QTYDELIVERED
-ORDER BY ORGNAME, BPNAME, DOCUMENTNO]]></queryString>
-
+ORDER BY ORGNAME, BPNAME, DOCUMENTNO]]>
+ </queryString>
<field name="orgname" class="java.lang.String"/>
<field name="bpname" class="java.lang.String"/>
<field name="documentno" class="java.lang.String"/>
@@ -176,909 +98,523 @@
<field name="orderedqty" class="java.lang.String"/>
<field name="pendingqty" class="java.lang.String"/>
<field name="qtyinstock" class="java.lang.String"/>
-
-
- <group name="orgname" >
-
<groupExpression><![CDATA[$F{orgname}]]></groupExpression>
- <groupHeader>
- <band height="20" isSplitAllowed="true" >
+ <group name="orgname">
+ <groupExpression><![CDATA[$F{orgname}]]></groupExpression>
+ <groupHeader>
+ <band height="20" splitType="Stretch">
<staticText>
- <reportElement
- style="GroupHeader_DarkGray"
- x="0"
- y="0"
- width="84"
- height="20"
- forecolor="#FFFFFF"
- key="staticText"/>
- <box leftPadding="5">
<pen lineWidth="0.0"/>
+ <reportElement key="staticText"
style="GroupHeader_DarkGray" x="0" y="0" width="84" height="20"
forecolor="#FFFFFF"/>
+ <box leftPadding="5">
+ <pen lineWidth="0.0"/>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Left"
verticalAlignment="Middle">
+ <font fontName="Bitstream Vera
Sans" size="10" isBold="true"/>
+ </textElement>
+ <text><![CDATA[Organization]]></text>
+ </staticText>
+ <textField pattern="" isBlankWhenNull="false">
+ <reportElement key="textField"
style="GroupHeader_DarkGray" x="84" y="0" width="698" height="20"
forecolor="#FFFFFF"/>
+ <box leftPadding="5">
+ <pen lineWidth="0.0"/>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Left"
verticalAlignment="Middle">
+ <font fontName="Bitstream Vera
Sans" size="10" isBold="true"/>
+ </textElement>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{orgname}]]></textFieldExpression>
+ </textField>
+ </band>
+ </groupHeader>
+ <groupFooter>
+ <band height="10" splitType="Stretch">
+ <line>
+ <reportElement key="line-6" x="0" y="9"
width="782" height="1" forecolor="#555555"/>
+ </line>
+ <line>
+ <reportElement key="line-17"
stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10"
forecolor="#555555"/>
+ </line>
+ <line>
+ <reportElement key="line-20"
stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10"
forecolor="#555555"/>
+ </line>
+ </band>
+ </groupFooter>
+ </group>
+ <group name="bpname">
+ <groupExpression><![CDATA[$F{bpname}]]></groupExpression>
+ <groupHeader>
+ <band height="40" splitType="Stretch">
+ <staticText>
+ <reportElement key="staticText"
style="GroupHeader_DarkGray" x="20" y="10" width="105" height="20"
forecolor="#FFFFFF"/>
+ <box leftPadding="5">
+ <pen lineWidth="0.0"/>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Left"
verticalAlignment="Middle">
+ <font fontName="Bitstream Vera
Sans" size="10" isBold="true"/>
+ </textElement>
+ <text><![CDATA[Business
Partner]]></text>
+ </staticText>
+ <textField pattern="" isBlankWhenNull="false">
+ <reportElement key="textField"
style="GroupHeader_DarkGray" x="125" y="10" width="657" height="20"
forecolor="#FFFFFF"/>
+ <box leftPadding="5">
+ <pen lineWidth="0.0"/>
+ <topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Left"
verticalAlignment="Middle">
+ <font fontName="Bitstream Vera
Sans" size="10" isBold="true"/>
+ </textElement>
+ <textFieldExpression
class="java.lang.String"><![CDATA[$F{bpname}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement key="line-3"
stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="40"
forecolor="#555555"/>
+ </line>
+ <line>
+ <reportElement key="line-11"
stretchType="RelativeToBandHeight" x="20" y="30" width="1" height="10"
forecolor="#555555"/>
+ </line>
+ <line>
+ <reportElement key="line-14"
stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10"
forecolor="#555555"/>
+ </line>
+ <line>
+ <reportElement key="line-28"
stretchType="RelativeToBandHeight" x="781" y="30" width="1" height="10"
forecolor="#555555"/>
+ </line>
+ </band>
+ </groupHeader>
+ <groupFooter>
+ <band height="10" splitType="Stretch">
+ <line>
+ <reportElement key="line-16"
stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10"
forecolor="#555555"/>
+ </line>
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
