Author: jacopoc
Date: Tue Jul 10 02:46:08 2007
New Revision: 554887
URL: http://svn.apache.org/viewvc?view=rev&rev=554887
Log:
Removed old fields from old Jasper report files; removed an entity from a view
definition because it was not linkable to the other ones.
Thanks to Adam Heath for the bug report OFBIZ-1115.
Modified:
ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml
ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?view=diff&rev=554887&r1=554886&r2=554887
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Tue Jul 10
02:46:08 2007
@@ -904,7 +904,6 @@
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="OPP" entity-name="OrderPaymentPreference"/>
<member-entity entity-alias="PMT" entity-name="PaymentMethodType"/>
- <member-entity entity-alias="SMT" entity-name="ShipmentMethodType"/>
<member-entity entity-alias="OS" entity-name="StatusItem"/>
<member-entity entity-alias="OI" entity-name="OrderItem"/>
<member-entity entity-alias="OIS" entity-name="StatusItem"/>
@@ -914,7 +913,6 @@
<alias entity-alias="OH" name="orderDate"/>
<alias entity-alias="OS" name="orderStatus" field="description"/>
<alias entity-alias="PMT" name="paymentMethod" field="description"/>
- <alias entity-alias="SMT" name="shipMethod" field="description"/>
<alias entity-alias="OH" name="visitId"/>
<alias entity-alias="OH" name="currencyUom"/>
<alias entity-alias="OH" name="originFacilityId"/>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml?view=diff&rev=554887&r1=554886&r2=554887
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml
Tue Jul 10 02:46:08 2007
@@ -43,7 +43,6 @@
<field name="orderStatus" class="java.lang.String"/>
<field name="paymentMethod" class="java.lang.String"/>
<field name="shipMethod" class="java.lang.String"/>
- <field name="shipCarrier" class="java.lang.String"/>
<field name="productId" class="java.lang.String"/>
<field name="itemDescription" class="java.lang.String"/>
<field name="itemStatus" class="java.lang.String"/>
@@ -569,24 +568,6 @@
<font fontName=""
pdfFontName="Helvetica" size="10" isBold="false" isItalic="false"
isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252"
isStrikeThrough="false" />
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{paymentMethod}]]></textFieldExpression>
- </textField>
- <textField isStretchWithOverflow="true"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >
<reportElement
- mode="Transparent"
- x="195"
- y="2"
- width="20"
- height="16"
- forecolor="#000000"
- backcolor="#FFFFFF"
- positionType="FixRelativeToTop"
- isPrintRepeatedValues="true"
- isRemoveLineWhenBlank="false"
- isPrintInFirstWholeBand="false"
-
isPrintWhenDetailOverflows="false"/>
- <textElement textAlignment="Left"
verticalAlignment="Top" lineSpacing="Single">
- <font fontName=""
pdfFontName="Helvetica" size="10" isBold="false" isItalic="false"
isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250"
isStrikeThrough="false" />
- </textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$F{shipCarrier}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >
<reportElement
mode="Transparent"
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml?view=diff&rev=554887&r1=554886&r2=554887
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml Tue
Jul 10 02:46:08 2007
@@ -42,8 +42,6 @@
<field name="orderDate" class="java.sql.Timestamp"/>
<field name="orderStatus" class="java.lang.String"/>
<field name="paymentMethod" class="java.lang.String"/>
- <field name="shipMethod" class="java.lang.String"/>
- <field name="shipCarrier" class="java.lang.String"/>
<field name="productId" class="java.lang.String"/>
<field name="itemDescription" class="java.lang.String"/>
<field name="itemStatus" class="java.lang.String"/>
@@ -714,42 +712,6 @@
<font fontName=""
pdfFontName="Helvetica" size="10" isBold="false" isItalic="false"
isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252"
isStrikeThrough="false" />
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{paymentMethod}]]></textFieldExpression>
- </textField>
- <textField isStretchWithOverflow="true"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >
<reportElement
- mode="Transparent"
- x="195"
- y="2"
- width="20"
- height="16"
- forecolor="#000000"
- backcolor="#FFFFFF"
- positionType="FixRelativeToTop"
- isPrintRepeatedValues="true"
- isRemoveLineWhenBlank="false"
- isPrintInFirstWholeBand="false"
-
isPrintWhenDetailOverflows="false"/>
- <textElement textAlignment="Left"
verticalAlignment="Top" lineSpacing="Single">
- <font fontName=""
pdfFontName="Helvetica" size="10" isBold="false" isItalic="false"
isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250"
isStrikeThrough="false" />
- </textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$F{shipCarrier}]]></textFieldExpression>
- </textField>
- <textField isStretchWithOverflow="true"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >
<reportElement
- mode="Transparent"
- x="215"
- y="2"
- width="45"
- height="16"
- forecolor="#000000"
- backcolor="#FFFFFF"
- positionType="FixRelativeToTop"
- isPrintRepeatedValues="true"
- isRemoveLineWhenBlank="false"
- isPrintInFirstWholeBand="false"
-
isPrintWhenDetailOverflows="false"/>
- <textElement textAlignment="Left"
verticalAlignment="Top" lineSpacing="Single">
- <font fontName=""
pdfFontName="Helvetica" size="10" isBold="false" isItalic="false"
isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250"
isStrikeThrough="false" />
- </textElement>
- <textFieldExpression
class="java.lang.String"><![CDATA[$F{shipMethod}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >
<reportElement
mode="Transparent"
