svn commit: r1736868 [17/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1736868 [17/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

jleroux@apache.org
Added: ofbiz/trunk/applications/order/template/reports/orderreport.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/orderreport.xml?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/orderreport.xml (added)
+++ ofbiz/trunk/applications/order/template/reports/orderreport.xml Mon Mar 28 11:14:22 2016
@@ -0,0 +1,908 @@
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+         name="OFB_Order_Report_1"
+         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">
+    <parameter name="dateRange" isForPrompting="false" class="java.lang.String"/>
+    <field name="groupName" class="java.lang.String"/>
+    <field name="orderId" class="java.lang.String"/>
+    <field name="orderDate" class="java.sql.Timestamp"/>
+    <field name="orderStatus" class="java.lang.String"/>
+    <field name="paymentMethod" 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"/>
+    <field name="quantity" class="java.lang.Double"/>
+    <field name="unitPrice" class="java.lang.Double"/>
+    <field name="grandTotal" class="java.lang.Double">
+        <fieldDescription><![CDATA[Order Grand Total]]></fieldDescription>
+    </field>
+    <variable name="orderQuantity" class="java.lang.Double" resetType="Group" resetGroup="orderId" calculation="Sum">
+        <variableExpression><![CDATA[$F{quantity}]]></variableExpression>    </variable>
+    <variable name="groupQuantity" class="java.lang.Double" resetType="Group" resetGroup="groupName" calculation="Sum">
+        <variableExpression><![CDATA[$F{quantity}]]></variableExpression>    </variable>
+    <variable name="groupTotal" class="java.lang.Double" resetType="Group" resetGroup="groupName" calculation="Sum">
+        <variableExpression><![CDATA[$V{purchaseAmount}]]></variableExpression>    </variable>
+    <variable name="purchaseAmount" class="java.lang.Double" resetType="None" calculation="Nothing">
+        <variableExpression><![CDATA[new Double($F{quantity}.doubleValue() * $F{unitPrice}.doubleValue())]]></variableExpression>    </variable>
+    <variable name="orderTotal" class="java.lang.Double" resetType="Group" resetGroup="orderId" calculation="Sum">
+        <variableExpression><![CDATA[$V{purchaseAmount}]]></variableExpression>    </variable>
+        <group  name="groupName" isStartNewColumn="false" isStartNewPage="false" isResetPageNumber="false" isReprintHeaderOnEachPage="false" minHeightToStartNewPage="0" >
+            <groupExpression><![CDATA[
+            $F{groupName}
+            ]]></groupExpression>
+            <groupHeader>
+            <band height="25">
+                <rectangle radius="0" >
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="0"
+                        width="782"
+                        height="25"
+                        forecolor="#8080FF"
+                        backcolor="#808080"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="None" fill="Solid"/>
+                </rectangle>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="9"
+                        y="0"
+                        width="478"
+                        height="25"
+                        forecolor="#FFFFFF"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica" size="18" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA[$F{groupName}]]></textFieldExpression>
+                </textField>
+            </band>
+            </groupHeader>
+            <groupFooter>
+            <band height="44">
+                <line direction="BottomUp">
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="38"
+                        width="781"
+                        height="0"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
+                </line>
+                <textField isStretchWithOverflow="false" pattern="###,###,###,###" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="groupName"  hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="454"
+                        y="19"
+                        width="55"
+                        height="14"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica-Bold" size="10" isBold="true" isItalic="false" isUnderline="true" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.Double"><![CDATA[$V{groupQuantity}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="$###,###,###,###.##" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="groupName"  hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="584"
+                        y="18"
+                        width="55"
+                        height="14"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica-Bold" size="10" isBold="true" isItalic="false" isUnderline="true" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.Double"><![CDATA[$V{groupTotal}]]></textFieldExpression>
+                </textField>
+                <line direction="BottomUp">
+                    <reportElement
+                        mode="Opaque"
+                        x="1"
+                        y="6"
+                        width="781"
+                        height="0"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
+                </line>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="367"
+                        y="17"
+                        width="49"
+                        height="15"
+                        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="16" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Total:]]></text>
+                </staticText>
+            </band>
+            </groupFooter>
+        </group>
+        <group  name="orderId" isStartNewColumn="false" isStartNewPage="false" isResetPageNumber="false" isReprintHeaderOnEachPage="false" minHeightToStartNewPage="0" >
+            <groupExpression><![CDATA[
+            $F{orderId}
+            ]]></groupExpression>
+            <groupHeader>
+            <band height="25">
+                <rectangle radius="0" >
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="0"
+                        width="782"
+                        height="25"
+                        forecolor="#FF0000"
+                        backcolor="#FFE1B9"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="1Point" fill="Solid"/>
+                </rectangle>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="13"
+                        y="0"
+                        width="52"
+                        height="23"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica" size="14" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Order:]]></text>
+                </staticText>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="74"
+                        y="0"
+                        width="98"
+                        height="23"
+                        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="14" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA[$F{orderId}]]></textFieldExpression>
+                </textField>
+            </band>
+            </groupHeader>
+            <groupFooter>
+            <band height="27">
+                <line direction="BottomUp">
+                    <reportElement
+                        mode="Opaque"
+                        x="1"
+                        y="2"
+                        width="781"
+                        height="0"
+                        forecolor="#8080FF"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
+                </line>
+                <textField isStretchWithOverflow="false" pattern="###,###,###,###" isBlankWhenNull="true" evaluationTime="Group" evaluationGroup="orderId"  hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="455"
+                        y="11"
+                        width="55"
+                        height="14"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica-Bold" size="10" isBold="true" isItalic="false" isUnderline="true" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.Double"><![CDATA[$V{orderQuantity}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="$###,###,###.##" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="orderId"  hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="587"
+                        y="10"
+                        width="55"
+                        height="14"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica-Bold" size="10" isBold="true" isItalic="false" isUnderline="true" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.Double"><![CDATA[$V{orderTotal}]]></textFieldExpression>
+                </textField>
+            </band>
+            </groupFooter>
+        </group>
+        <background>
+            <band height="0">
+            </band>
+        </background>
+        <title>
+            <band height="50">
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="185"
+                        y="5"
+                        width="412"
+                        height="40"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Center" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="" pdfFontName="Helvetica-Bold" size="30" isBold="true" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Order Report]]></text>
+                </staticText>
+                <line direction="TopDown">
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="48"
+                        width="781"
+                        height="0"
+                        forecolor="#808080"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
+                </line>
+                <line direction="TopDown">
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="3"
+                        width="781"
+                        height="0"
+                        forecolor="#808080"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
+                </line>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="574"
+                        y="20"
+                        width="202"
+                        height="17"
+                        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[$P{dateRange}]]></textFieldExpression>
+                </textField>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="506"
+                        y="20"
+                        width="65"
+                        height="17"
+                        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>
+                <text><![CDATA[Date Range:]]></text>
+                </staticText>
+            </band>
+        </title>
+        <pageHeader>
+            <band height="9">
+            </band>
+        </pageHeader>
+        <columnHeader>
+            <band height="20">
+                <line direction="BottomUp">
+                    <reportElement
+                        mode="Opaque"
+                        x="0"
+                        y="0"
+                        width="782"
+                        height="0"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
+                </line>
+                <line direction="BottomUp">
+                    <reportElement
+                        mode="Opaque"
+                        x="1"
+                        y="20"
+                        width="782"
+                        height="0"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="Thin" fill="Solid"/>
+                </line>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="2"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Order Date]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="74"
+                        y="1"
+                        width="42"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Status]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="130"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Payment]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="195"
+                        y="1"
+                        width="20"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Carrier]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="215"
+                        y="1"
+                        width="45"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Shipping Method]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="260"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Product]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="318"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Description]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="396"
+                        y="1"
+                        width="62"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Item Status]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="462"
+                        y="1"
+                        width="46"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Quantity]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="520"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Unit Price]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement
+                        mode="Transparent"
+                        x="585"
+                        y="1"
+                        width="65"
+                        height="17"
+                        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="12" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="Cp1250" isStrikeThrough="false"/>
+                    </textElement>
+                <text><![CDATA[Purchase]]></text>
+                </staticText>
+            </band>
+        </columnHeader>
+        <detail>
+            <band height="18">
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="0"
+                        y="2"
+                        width="65"
+                        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.sql.Timestamp"><![CDATA[$F{orderDate}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="65"
+                        y="2"
+                        width="65"
+                        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 ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA[$F{orderStatus}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="130"
+                        y="2"
+                        width="65"
+                        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 ="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="260"
+                        y="2"
+                        width="59"
+                        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{productId}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="324"
+                        y="2"
+                        width="77"
+                        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{itemDescription}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="408"
+                        y="2"
+                        width="47"
+                        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 ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA[$F{itemStatus}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="###,###,###" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="455"
+                        y="2"
+                        width="55"
+                        height="16"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" 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.Double"><![CDATA[$F{quantity}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="520"
+                        y="2"
+                        width="65"
+                        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 ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.Double"><![CDATA[$F{unitPrice}]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="$###,###,###.##" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="584"
+                        y="2"
+                        width="55"
+                        height="16"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" 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.Double"><![CDATA[$V{purchaseAmount}]]></textFieldExpression>
+                </textField>
+            </band>
+        </detail>
+        <columnFooter>
+            <band height="0">
+            </band>
+        </columnFooter>
+        <pageFooter>
+            <band height="27">
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="572"
+                        y="6"
+                        width="174"
+                        height="19"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Right" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="Helvetica" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+                </textField>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="746"
+                        y="6"
+                        width="36"
+                        height="19"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="Helvetica" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+                </textField>
+                <line direction="TopDown">
+                    <reportElement
+                        mode="Opaque"
+                        x="1"
+                        y="3"
+                        width="782"
+                        height="0"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <graphicElement stretchType="NoStretch" pen="2Point" fill="Solid"/>
+                </line>
+                <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" >                    <reportElement
+                        mode="Transparent"
+                        x="1"
+                        y="6"
+                        width="209"
+                        height="19"
+                        forecolor="#000000"
+                        backcolor="#FFFFFF"
+                        positionType="FixRelativeToTop"
+                        isPrintRepeatedValues="true"
+                        isRemoveLineWhenBlank="false"
+                        isPrintInFirstWholeBand="false"
+                        isPrintWhenDetailOverflows="false"/>
+                    <textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
+                        <font fontName="Helvetica" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false"/>
+                    </textElement>
+                <textFieldExpression   class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+                </textField>
+            </band>
+        </pageFooter>
+        <summary>
+            <band height="0">
+            </band>
+        </summary>
+</jasperReport>

Propchange: ofbiz/trunk/applications/order/template/reports/orderreport.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/orderreport.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/orderreport.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/order/template/reports/reportlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/reportlist.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/reportlist.ftl (added)
+++ ofbiz/trunk/applications/order/template/reports/reportlist.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,93 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class='tabletext'>NOTE: These report are for demonstration purposes only.
+They use the JasperReports reporting tool. They have not been polished yet, but
+they are good examples of creating detailed reports that you have a lot of
+control over. special thanks for Britton LaRoche for creating the first pass of
+these reports and helping to improve them.</div>
+<br />
+
+<form method="post" name="orderreportform" action="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" target="OrderReport">
+<table>
+<tr>
+<td><div>From Date:</div></td>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+</td>
+</tr>
+<tr>
+<td><div>To Date:</div></td>
+<td>
+ <@htmlTemplate.renderDateTimeField name="toDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="t" oDate1dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+</td>
+</tr>
+<#--
+<tr>
+<td><div>Report:</div></td>
+<td>
+   <select name="groupName" tabindex="14"  CLASS="stateSelectBox">
+     <option value="orderStatus"></option>
+     <option value="orderStatus">Orders by Order Status</option>
+     <option value="ship">Orders by Ship Method</option>
+     <option value="payment">Orders by Payment Method</option>
+     <option value="adjustment">Order Items by Adjustment</option>
+     <option value="itemStatus">Order Items by Status</option>
+     <option value="product">Order Items by Product</option>
+   </select>
+</td>
+</tr>
+-->
+</table>
+ <input type="submit" tabindex="16" class="button" name="GoReport" value="Order Report">
+</form>
+
+<form method="post" name="itemreportform" action="<@ofbizUrl>orderitemreportjasper.pdf</@ofbizUrl>" target="OrderReport">
+<table>
+<tr>
+<td><div>From Date:</div></td>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+</td>
+</tr>
+<tr>
+<td><div>To Date:</div></td>
+<td>
+ <@htmlTemplate.renderDateTimeField name="toDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="toDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+</td>
+</tr>
+<#--
+<tr>
+<td><div>Report:</div></td>
+<td>
+   <select name="groupName" tabindex="14"  class="stateSelectBox">
+     <option value="orderStatus"></option>
+     <option value="orderStatus">Orders by Order Status</option>
+     <option value="ship">Orders by Ship Method</option>
+     <option value="payment">Orders by Payment Method</option>
+     <option value="adjustment">Order Items by Adjustment</option>
+     <option value="itemStatus">Order Items by Status</option>
+     <option value="product">Order Items by Product</option>
+   </select>
+</td>
+</tr>
+-->
+</table>
+ <input type="submit" tabindex="16" class="button" name="GoReport" value="Item Report">
+</form>

Propchange: ofbiz/trunk/applications/order/template/reports/reportlist.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/reports/reportlist.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/reports/reportlist.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,38 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <title>${title}</title>
+        <link rel="stylesheet" href="${baseSecureUrl!}/images/maincss.css" type="text/css"/>
+    </head>
+    <body>
+        <h2>${title}</h2>
+        <p>Hello ${person.firstName!} ${person.lastName!},</p>
+        <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has a note added to it:<br />
+        ${StringUtil.wrapString(noteData.noteInfo!)}
+        <br /><br />
+        Please login to the url below and add another note as a reply if required.<br /><br />
+        The status and used hours can always be checked <br />
+        <a href="${StringUtil.wrapString(baseSecureUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&amp;id=${custRequest.custRequestId}">here.....</a>
+        <br /><br />
+        Regards.<br /><br />
+        Thank you for your business.
+    </body>
+</html>

Propchange: ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,36 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <title>${title}</title>
+        <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
+    </head>
+    <body>
+        <h1>${title}</h1>
+        <p>Hello ${person.firstName!} ${person.lastName!},</p>
+        <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been completed.
+        <br /><br />
+        The status and used hours can always be checked at the url: <br />
+        <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&amp;id=${custRequest.custRequestId}">${baseUrl!}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
+        <br /><br />
+        Regards.<br /><br />
+        Thank you for your business.
+    </body>
+</html>

Propchange: ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,30 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if custRequestItem??>
+<form action="<@ofbizUrl>copyCustRequestItem</@ofbizUrl>" method="post">
+    <input type="hidden" name="custRequestId" value="${custRequestItem.custRequestId}"/>
+    <input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/>
+    <div>
+        <span class="label">${uiLabelMap.OrderCopyCustRequestItem}</span>
+        ${uiLabelMap.OrderOrderQuoteItems}&nbsp;<input type="checkbox" name="copyLinkedQuotes" value="Y"/>
+    </div>
+    <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/>
+</form>
+</#if>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/CopyRequestItem.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,40 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <title>${title}</title>
+        <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
+    </head>
+    <body>
+        <h1>${title}</h1>
+        <p>Hello ${person.firstName!} ${person.middleName!} ${person.lastName!},</p>
+        <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been created successfully.
+        <br /><br />
+        We will solve/implement the request as soon as possible
+        <br /><br />
+        The status and used hours can always be checked <br />
+        <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&amp;id=${custRequest.custRequestId}">here....</a>
+        <br /><br />
+        Regards.
+        <br /><br />
+        PS. we will notify you when the customer request is completed.
+        </p>
+    </body>
+</html>

Propchange: ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,26 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if custRequestItem??>
+  <#if quoteId?has_content>
+  <div><a href="<@ofbizUrl>EditQuoteItemForRequest?quoteId=${quoteId}&custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleEditQuoteItemForCustRequest}</a> [${quoteId}]</div>
+  <#else>
+  <div><a href="<@ofbizUrl>CreateQuoteAndQuoteItemForRequest?custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleCreateQuoteForCustRequest}</a></div>
+  </#if>
+</#if>

Propchange: ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/QuoteLinks.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,68 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <div class="h3">${uiLabelMap.OrderRequestItems}</div>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr valign="bottom" class="header-row">
+                <td width="10%">${uiLabelMap.ProductItem}</td>
+                <td width="35%">${uiLabelMap.OrderProduct}</td>
+                <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td>
+                <td width="10%" align="right">${uiLabelMap.OrderAmount}</td>
+                <td width="10%" align="right">${uiLabelMap.OrderRequestMaximumAmount}</td>
+                <td width="5%" align="right">&nbsp;</td>
+            </tr>
+            <#assign alt_row = false>
+            <#list requestItems as requestItem>
+                <#if requestItem.productId??>
+                    <#assign product = requestItem.getRelatedOne("Product", false)>
+                </#if>
+                <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                    <td valign="top">
+                        <div>
+                            <#if showRequestManagementLinks??>
+                                <a href="<@ofbizUrl>EditRequestItem?custRequestId=${requestItem.custRequestId}&amp;custRequestItemSeqId=${requestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a>
+                            <#else>
+                                ${requestItem.custRequestItemSeqId}
+                            </#if>
+                        </div>
+                    </td>
+                    <td valign="top">
+                        <div>
+                            ${(product.internalName)!}&nbsp;
+                            <#if showRequestManagementLinks??>
+                                <a href="/catalog/control/EditProduct?productId=${requestItem.productId!}" class="buttontext">${requestItem.productId!}</a>
+                            <#else>
+                                <a href="<@ofbizUrl>product?product_id=${requestItem.productId!}</@ofbizUrl>" class="buttontext">${requestItem.productId!}</a>
+                            </#if>
+                        </div>
+                    </td>
+                    <td align="right" valign="top">${requestItem.quantity!}</td>
+                    <td align="right" valign="top">${requestItem.selectedAmount!}</td>
+                    <td align="right" valign="top"><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></td>
+                </tr>
+                <#-- toggle the row color -->
+                <#assign alt_row = !alt_row>
+            </#list>
+        </table>
+    </div>
+</div>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/ViewRequestItemInfo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/requestContactMech.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/requestContactMech.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/requestContactMech.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,79 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if fulfillContactMech?has_content>
+
+<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+  <#assign label = uiLabelMap.PartyAddressMailingShipping>
+  <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)!>
+<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+  <#assign label = uiLabelMap.PartyToEmailAddress>
+  <#assign emailAddress = fulfillContactMech.infoString!>
+<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
+  <#assign label = uiLabelMap.PartyPhoneNumber>
+  <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)!>
+</#if>
+
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <div class="h3">${uiLabelMap.PartyContactInformation}</div>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr>
+                <td align="right" valign="top" width="25%" class="label">
+                    &nbsp;${label?default(uiLabelMap.PartyUnknown)}
+                </td>
+                <td width="5%">&nbsp;</td>
+                <td valign="top" width="70%">
+                    <div>
+                      <#if emailAddress?has_content>${emailAddress}</#if>
+
+                      <#if postalAddress?has_content>
+                        <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span>&nbsp;${postalAddress.toName}<br /></#if>
+                        <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span>&nbsp;${postalAddress.attnName}<br /></#if>
+                        ${postalAddress.address1!}<br />
+                        <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+                        ${postalAddress.city!},
+                        <#if postalAddress.stateProvinceGeoId?has_content>
+                            <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
+                            ${stateProvince.abbreviation?default(stateProvince.geoId)}
+                        </#if>
+                        ${postalAddress.postalCode!}
+                        <#if postalAddress.countryGeoId?has_content><br />
+                             <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
+                             ${country.geoName?default(country.geoId)}
+                        </#if>
+                      </#if>
+
+                      <#if telecomNumber?has_content>
+                        ${telecomNumber.countryCode!}
+                        <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
+                        <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+                          <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
+                          <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+                        </#if>
+                      </#if>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+</#if>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/requestDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/requestDate.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/requestDate.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/requestDate.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,56 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <div class="h3">${uiLabelMap.CommonDate}</div>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+            <tr>
+                <td align="right" valign="top" width="25%" class="label">
+                    &nbsp;${uiLabelMap.OrderRequestDate}
+                </td>
+                <td width="5%">&nbsp;</td>
+                <td valign="top" width="70%">
+                    ${(custRequest.custRequestDate.toString())!}
+                </td>
+            </tr>
+            <tr><td colspan="7"><hr /></td></tr>
+            <tr>
+                <td align="right" valign="top" width="25%" class="label">
+                    &nbsp;${uiLabelMap.OrderRequestCreatedDate}
+                </td>
+                <td width="5%">&nbsp;</td>
+                <td valign="top" width="70%">
+                    ${(custRequest.createdDate.toString())!}
+                </td>
+            </tr>
+            <tr><td colspan="7"><hr /></td></tr>
+            <tr>
+                <td align="right" valign="top" width="25%" class="label">
+                    &nbsp;${uiLabelMap.OrderRequestLastModifiedDate}
+                </td>
+                <td width="5%">&nbsp;</td>
+                <td valign="top" width="70%">
+                    ${(custRequest.lastModifiedDate.toString())!}
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>

Propchange: ofbiz/trunk/applications/order/template/request/requestDate.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/requestDate.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/requestDate.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl (added)
+++ ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,23 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if showAll = "false">
+    <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}&amp;showAll=true</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowAllNotes}</a>
+<#else>
+    <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}&amp;showAll=false</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowThisItemsNotes}</a>
+</#if>

Propchange: ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain