svn commit: r935026 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

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

svn commit: r935026 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

eckardjf
Author: eckardjf
Date: Fri Apr 16 18:26:30 2010
New Revision: 935026

URL: http://svn.apache.org/viewvc?rev=935026&view=rev
Log:
if the supplierProductId is present (purchase orders) display that instead of productId

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=935026&r1=935025&r2=935026&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Fri Apr 16 18:26:30 2010
@@ -48,7 +48,9 @@ under the License.
                     <fo:table-row>
                         <fo:table-cell>
                             <fo:block>
-                                <#if productId?exists>
+                                <#if orderItem.supplierProductId?has_content>
+                                    ${orderItem.supplierProductId} - ${orderItem.itemDescription?if_exists}
+                                <#elseif productId?exists>
                                     ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
                                 <#elseif orderItemType?exists>
                                     ${orderItemType.get("description",locale)} - ${orderItem.itemDescription?if_exists}