svn commit: r453078 - in /incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order: orderReportConditions.fo.ftl orderReportContactMechs.fo.ftl

[sichen]

Author: sichen
Date: Wed Oct  4 18:20:52 2006
New Revision: 453078

URL: http://svn.apache.org/viewvc?view=rev&rev=453078
Log:
On purchase orders, display vendor name when there is no vendor address

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?view=diff&rev=453078&r1=453077&r2=453078
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Wed Oct  4 18:20:52 2006
@@ -18,10 +18,10 @@
 <#if orderHeader.getString("orderTypeId") == "SALES_ORDER">
   <fo:block font-size="14pt" font-weight="bold" text-align="center">THANK YOU FOR YOUR PATRONAGE!</fo:block>
   <fo:block font-size="8pt">
-    Here is a good place to put policies and return information.
+    <#--    Here is a good place to put policies and return information. -->
   </fo:block>
 <#elseif orderHeader.getString("orderTypeId") == "PURCHASE_ORDER">
   <fo:block font-size="8pt">
-    Here is a good place to put boilerplate terms and conditions for a purchase order.
+    <#-- Here is a good place to put boilerplate terms and conditions for a purchase order. -->
   </fo:block>
 </#if>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?view=diff&rev=453078&r1=453077&r2=453078
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Wed Oct  4 18:20:52 2006
@@ -34,6 +34,14 @@
 ${postalAddress.countryGeoId?if_exists}
 </fo:block>
                </fo:table-cell>
+             <#else>
+               <#-- here we just display the name of the vendor, since there is no address -->
+               <fo:table-cell>
+                 <#assign vendorParty = orderReadHelper.getBillFromParty()>
+                 <fo:block white-space-collapse="false">
+<fo:block font-weight="bold">${uiLabelMap.OrderPurchasedFrom}:</fo:block>${Static['org.ofbiz.party.party.PartyHelper'].getPartyName(vendorParty)}
+                 </fo:block>
+               </fo:table-cell>
              </#if>
              </#if>
             
@@ -44,7 +52,7 @@
                <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
                <fo:table-cell>
                  <fo:block white-space-collapse="false">
-<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)} : </fo:block><#assign postalAddress = orderContactMechValueMap.postalAddress><#if postalAddress?has_content><#if postalAddress.toName?has_content>${postalAddress.toName}</#if><#if postalAddress.attnName?has_content>
+<fo:block font-weight="bold">${contactMechPurpose.get("description",locale)}: </fo:block><#assign postalAddress = orderContactMechValueMap.postalAddress><#if postalAddress?has_content><#if postalAddress.toName?has_content>${postalAddress.toName}</#if><#if postalAddress.attnName?has_content>
 ${postalAddress.attnName}</#if>
 ${postalAddress.address1}<#if postalAddress.address2?has_content>
 ${postalAddress.address2}</#if>
@@ -111,4 +119,4 @@
           </fo:table-body>
        </fo:table>
 
-<fo:block space-after="10pt"/>
\ No newline at end of file
+<fo:block space-after="10pt"/>