OFBiz › OFBiz - Commits

svn commit: r762648 [5/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accou...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r762648 [5/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accou...

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?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml Tue Apr 7 08:27:15 2009
@@ -72,7 +72,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="None" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="None" fill="Solid"/>
</rectangle>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -88,7 +88,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{groupName}]]></textFieldExpression>
</textField>
@@ -110,7 +110,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="###,###,###,###" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="groupName" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -126,7 +126,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{groupQuantity}]]></textFieldExpression>
</textField>
@@ -144,7 +144,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{groupTotal}]]></textFieldExpression>
</textField>
@@ -162,7 +162,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<staticText>
<reportElement
@@ -179,7 +179,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Total:]]></text>
</staticText>
@@ -207,7 +207,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Center" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order Item Report]]></text>
</staticText>
@@ -225,7 +225,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<line direction="TopDown">
<reportElement
@@ -241,7 +241,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -257,7 +257,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{dateRange}]]></textFieldExpression>
</textField>
@@ -276,7 +276,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Date Range:]]></text>
</staticText>
@@ -302,7 +302,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<line direction="BottomUp">
<reportElement
@@ -318,7 +318,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<staticText>
<reportElement
@@ -335,7 +335,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order Date]]></text>
</staticText>
@@ -354,7 +354,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Payment]]></text>
</staticText>
@@ -373,7 +373,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Carrier]]></text>
</staticText>
@@ -392,7 +392,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Shipping Method]]></text>
</staticText>
@@ -411,7 +411,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Product]]></text>
</staticText>
@@ -430,7 +430,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Description]]></text>
</staticText>
@@ -449,7 +449,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Item Status]]></text>
</staticText>
@@ -468,7 +468,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Quantity]]></text>
</staticText>
@@ -487,7 +487,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Unit Price]]></text>
</staticText>
@@ -506,7 +506,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Purchase]]></text>
</staticText>
@@ -525,7 +525,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order]]></text>
</staticText>
@@ -547,7 +547,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.sql.Timestamp"><![CDATA[$F{orderDate}]]></textFieldExpression>
</textField>
@@ -565,7 +565,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{paymentMethod}]]></textFieldExpression>
</textField>
@@ -583,7 +583,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{shipMethod}]]></textFieldExpression>
</textField>
@@ -601,7 +601,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{productId}]]></textFieldExpression>
</textField>
@@ -619,7 +619,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{itemDescription}]]></textFieldExpression>
</textField>
@@ -637,7 +637,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{itemStatus}]]></textFieldExpression>
</textField>
@@ -655,7 +655,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$F{quantity}]]></textFieldExpression>
</textField>
@@ -673,7 +673,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$F{unitPrice}]]></textFieldExpression>
</textField>
@@ -691,7 +691,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{purchaseAmount}]]></textFieldExpression>
</textField>
@@ -709,7 +709,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderId}]]></textFieldExpression>
</textField>
@@ -735,7 +735,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
</textField>
@@ -753,7 +753,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
@@ -771,7 +771,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -787,7 +787,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
</textField>

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?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml Tue Apr 7 08:27:15 2009
@@ -80,7 +80,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="None" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="None" fill="Solid"/>
</rectangle>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -96,7 +96,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{groupName}]]></textFieldExpression>
</textField>
@@ -118,7 +118,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="###,###,###,###" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="groupName" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -134,7 +134,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{groupQuantity}]]></textFieldExpression>
</textField>
@@ -152,7 +152,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{groupTotal}]]></textFieldExpression>
</textField>
@@ -170,7 +170,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<staticText>
<reportElement
@@ -187,7 +187,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Total:]]></text>
</staticText>
@@ -214,7 +214,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="1Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="1Point" fill="Solid"/>
</rectangle>
<staticText>
<reportElement
@@ -231,7 +231,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order:]]></text>
</staticText>
@@ -249,7 +249,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderId}]]></textFieldExpression>
</textField>
@@ -271,7 +271,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="###,###,###,###" isBlankWhenNull="true" evaluationTime="Group" evaluationGroup="orderId" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -287,7 +287,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{orderQuantity}]]></textFieldExpression>
</textField>
@@ -305,7 +305,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{orderTotal}]]></textFieldExpression>
</textField>
@@ -333,7 +333,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Center" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order Report]]></text>
</staticText>
@@ -351,7 +351,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<line direction="TopDown">
<reportElement
@@ -367,7 +367,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -383,7 +383,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{dateRange}]]></textFieldExpression>
</textField>
@@ -402,7 +402,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Date Range:]]></text>
</staticText>
@@ -428,7 +428,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<line direction="BottomUp">
<reportElement
@@ -444,7 +444,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
</line>
<staticText>
<reportElement
@@ -461,7 +461,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Order Date]]></text>
</staticText>
@@ -480,7 +480,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Status]]></text>
</staticText>
@@ -499,7 +499,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Payment]]></text>
</staticText>
@@ -518,7 +518,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Carrier]]></text>
</staticText>
@@ -537,7 +537,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Shipping Method]]></text>
</staticText>
@@ -556,7 +556,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Product]]></text>
</staticText>
@@ -575,7 +575,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Description]]></text>
</staticText>
@@ -594,7 +594,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Item Status]]></text>
</staticText>
@@ -613,7 +613,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Quantity]]></text>
</staticText>
@@ -632,7 +632,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Unit Price]]></text>
</staticText>
@@ -651,7 +651,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<text><![CDATA[Purchase]]></text>
</staticText>
@@ -673,7 +673,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.sql.Timestamp"><![CDATA[$F{orderDate}]]></textFieldExpression>
</textField>
@@ -691,7 +691,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{orderStatus}]]></textFieldExpression>
</textField>
@@ -709,7 +709,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{paymentMethod}]]></textFieldExpression>
</textField>
@@ -727,7 +727,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{productId}]]></textFieldExpression>
</textField>
@@ -745,7 +745,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{itemDescription}]]></textFieldExpression>
</textField>
@@ -763,7 +763,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{itemStatus}]]></textFieldExpression>
</textField>
@@ -781,7 +781,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$F{quantity}]]></textFieldExpression>
</textField>
@@ -799,7 +799,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$F{unitPrice}]]></textFieldExpression>
</textField>
@@ -817,7 +817,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.Double"><![CDATA[$V{purchaseAmount}]]></textFieldExpression>
</textField>
@@ -843,7 +843,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
</textField>
@@ -861,7 +861,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
@@ -879,7 +879,7 @@
isRemoveLineWhenBlank="false"
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
- <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid" />
+ <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
</line>
<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" > <reportElement
mode="Transparent"
@@ -895,7 +895,7 @@
isPrintInFirstWholeBand="false"
isPrintWhenDetailOverflows="false"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
- 
+ 
</textElement>
<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
</textField>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Tue Apr 7 08:27:15 2009
@@ -40,10 +40,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupOrderHeader" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -67,10 +67,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -95,10 +95,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -122,10 +122,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupCustRequest" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -149,10 +149,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupCustRequestItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -175,10 +175,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupQuote" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -202,10 +202,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupQuoteItem" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -228,10 +228,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupRequirement" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -254,10 +254,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupShoppingList" location="component://order/webapp/ordermgr/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Tue Apr 7 08:27:15 2009
@@ -63,7 +63,7 @@
<set field="tabButtonItem" value="QuoteWorkEfforts"/>
<set field="labelTitleProperty" value="PageTitleEditQuoteWorkEffort"/>

- <set field="donePage" from-field="parameters.DONE_PAGE" />
+ <set field="donePage" from-field="parameters.DONE_PAGE"/>
<set field="quoteId" from-field="parameters.quoteId"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<entity-one entity-name="Quote" value-field="quote"/>

Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Tue Apr 7 08:27:15 2009
@@ -24,73 +24,73 @@
<PortalPortlet portalPortletId="party"
portletName="Party Info"
screenName="Party"
- screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group" />
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group"/>
<PortletPortletCategory portalPortletId="party" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="Attributes" portletName="Attributes"
screenName="Attributes"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Attributes of a party" />
+ description="Attributes of a party"/>
<PortletPortletCategory portalPortletId="Attributes" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings"
screenName="AvsSettings"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Avs Settings of a party" />
+ description="Avs Settings of a party"/>
<PortletPortletCategory portalPortletId="AvsSettings" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="Content" portletName="Content"
screenName="Content"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Attached Content of a party" />
+ description="Attached Content of a party"/>
<PortletPortletCategory portalPortletId="Content" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points"
screenName="LoyaltyPoints"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Loyalty Points of a party" />
+ description="Loyalty Points of a party"/>
<PortletPortletCategory portalPortletId="LoyaltyPoints" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party"
screenName="mytasks"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Assigned Tasks of a party" />
+ description="Assigned Tasks of a party"/>
<PortletPortletCategory portalPortletId="MYTASKSPARTY" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="Notes" portletName="Notes"
screenName="Notes"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Notes of a party" />
+ description="Notes of a party"/>
<PortletPortletCategory portalPortletId="Notes" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods"
screenName="PaymentMethods"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="PaymentMethods of a party" />
+ description="PaymentMethods of a party"/>
<PortletPortletCategory portalPortletId="PaymentMethods" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account"
screenName="ShipperAccount"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Shipper Accounts of a party" />
+ description="Shipper Accounts of a party"/>
<PortletPortletCategory portalPortletId="ShipperAccount" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="UserLogin" portletName="User Login"
screenName="UserLogin"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="User Logins of a party" />
+ description="User Logins of a party"/>
<PortletPortletCategory portalPortletId="UserLogin" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="Visits" portletName="Visits"
screenName="Visits"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="Visits of a certain party" />
+ description="Visits of a certain party"/>
<PortletPortletCategory portalPortletId="Visits" portletCategoryId="PROFILE"/>

<PortalPortlet portalPortletId="contact" portletName="Contact"
screenName="Contact"
screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
- description="contact methods of a party" />
+ description="contact methods of a party"/>
<PortletPortletCategory portalPortletId="contact" portletCategoryId="PROFILE"/>


@@ -98,7 +98,7 @@
<PortalPortlet portalPortletId="MyCommunications" portletName="My Communications" description="IN and outgoing Communication list of a party"
screenName="MyCommunicationEvents"
screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
- editFormName="EditPartyId" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml" />
+ editFormName="EditPartyId" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml"/>
<PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/>

</entity-engine-xml>

Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Tue Apr 7 08:27:15 2009
@@ -406,6 +406,6 @@
<Enumeration description="Organization party" enumCode="" enumId="ORGANIZATION_PARTY" sequenceId="01" enumTypeId="GLOBAL_PREFERENCES"/>
<Enumeration description="Visual Theme" enumCode="" enumId="VISUAL_THEME" sequenceId="02" enumTypeId="GLOBAL_PREFERENCES"/>

- <WebSite webSiteId="PARTY" siteName="Party Manager" visualThemeSetId="BACKOFFICE" />
+ <WebSite webSiteId="PARTY" siteName="Party Manager" visualThemeSetId="BACKOFFICE"/>

</entity-engine-xml>

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Tue Apr 7 08:27:15 2009
@@ -598,8 +598,8 @@
<member-entity entity-alias="CECA" entity-name="CommEventContentAssoc"/>
<member-entity entity-alias="CO" entity-name="Content"/>
<member-entity entity-alias="DR" entity-name="DataResource"/>
- <alias-all entity-alias="CECA" />
- <alias-all entity-alias="CO" />
+ <alias-all entity-alias="CECA"/>
+ <alias-all entity-alias="CO"/>
<alias-all entity-alias="DR" prefix="dr"/>
<view-link entity-alias="CECA" rel-entity-alias="CO" rel-optional="false">
<key-map field-name="contentId"/>
@@ -608,22 +608,22 @@
<key-map field-name="dataResourceId"/>
</view-link>
<relation type="one-nofk" rel-entity-name="ElectronicText">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="CommunicationEvent">
- <key-map field-name="communicationEventId" />
+ <key-map field-name="communicationEventId"/>
</relation>
<relation type="one-nofk" rel-entity-name="ImageDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="OtherDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" title="From" rel-entity-name="ContentAssoc">
<key-map field-name="contentId"/>
@@ -1550,8 +1550,8 @@
title="PartyAcctgPreference and PartyGroup Entity">
<member-entity entity-alias="PTYACCPREF" entity-name="PartyAcctgPreference"/>
<member-entity entity-alias="PTYGROUP" entity-name="PartyGroup"/>
- <alias entity-alias="PTYACCPREF" name="partyId" />
- <alias entity-alias="PTYACCPREF" name="baseCurrencyUomId" />
+ <alias entity-alias="PTYACCPREF" name="partyId"/>
+ <alias entity-alias="PTYACCPREF" name="baseCurrencyUomId"/>
<alias entity-alias="PTYGROUP" name="groupName"/>
<view-link entity-alias="PTYACCPREF" rel-entity-alias="PTYGROUP">
<key-map field-name="partyId"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml Tue Apr 7 08:27:15 2009
@@ -27,7 +27,7 @@
<if-not-empty field="parameters.lastName">
<set from-field="parameters.lastName" field="LookupMap.lastName"/>
</if-not-empty>
- <find-by-and entity-name="Person" map="LookupMap" list="parties" />
+ <find-by-and entity-name="Person" map="LookupMap" list="parties"/>
<iterate entry="party" list="parties">
<set from-field="party.firstName" field="resultEntry.label"/>
<set from-field="party.partyId" field="resultEntry.value"/>