You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/12/02 04:39:53 UTC
svn commit: r1209354 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml
Author: hansbak
Date: Fri Dec 2 03:39:50 2011
New Revision: 1209354
URL: http://svn.apache.org/viewvc?rev=1209354&view=rev
Log:
files missing on last commit 1209351
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml
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=1209354&r1=1209353&r2=1209354&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Fri Dec 2 03:39:50 2011
@@ -64,8 +64,10 @@ under the License.
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <#if internalImageUrl?has_content>
- <fo:external-graphic src="${internalImageUrl}" overflow="hidden" content-width="100"/>
+ <#if orderHeader.orderTypeId == "PURCHASE_ORDER">
+ <#if internalImageUrl?has_content>
+ <fo:external-graphic src="${internalImageUrl}" overflow="hidden" content-width="100"/>
+ </#if>
</#if>
</fo:block>
</fo:table-cell>
@@ -102,6 +104,7 @@ under the License.
<#if adjustmentAmount != 0>
<fo:table-row>
<fo:table-cell></fo:table-cell>
+ <fo:table-cell></fo:table-cell>
<fo:table-cell number-columns-spanned="2">
<fo:block font-weight="bold">
${adjustmentType.get("description",locale)} :
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml?rev=1209354&r1=1209353&r2=1209354&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml Fri Dec 2 03:39:50 2011
@@ -40,7 +40,7 @@ under the License.
<Content contentId="GZ-2644-Add3-CTNT-T" contentTypeId="DOCUMENT" contentName="web_browser4.png" dataResourceId="GZ-2644-Add3-T" statusId="CTNT_IN_PROGRESS"/>
<ContentAssoc contentId="GZ-2644-Add3-CTNT" contentIdTo="GZ-2644-Add3-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="GZ-2644-Add4" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="web_browser5.png" objectInfo="/images/products/GZ-2644/web_browser5.png" isPublic="Y"/>
+ <DataResource dataResourceId="GZ-2644-Add4" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="web_browser5.png" objectInfo="/images/products/GZ-2644/web_browser5.png" isPublic="N"/>
<Content contentId="GZ-2644-Add4-CTNT" contentTypeId="DOCUMENT" contentName="web_browser5.png" dataResourceId="GZ-2644-Add4" statusId="IM_APPROVED"/>
<ProductContent productId="GZ-2644" contentId="GZ-2644-Add4-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0"/>
<DataResource dataResourceId="GZ-2644-Add1-T" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="web_browser5.png" objectInfo="/images/products/GZ-2644/web_browser5.png" isPublic="Y"/>