You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/01/30 20:03:43 UTC
svn commit: r501521 - in /ofbiz/trunk/applications:
ecommerce/webapp/ecommerce/order/orderitems.ftl
order/webapp/ordermgr/entry/order/orderitems.ftl
order/webapp/ordermgr/order/orderitems.ftl
Author: jleroux
Date: Tue Jan 30 11:03:41 2007
New Revision: 501521
URL: http://svn.apache.org/viewvc?view=rev&rev=501521
Log:
Derived from an Ismail Cansiz's patch for "Bug in displaying order items when using old style calcTax service" (https://issues.apache.org/jira/browse/OFBIZ-667)
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?view=diff&rev=501521&r1=501520&r2=501521
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Jan 30 11:03:41 2007
@@ -187,7 +187,9 @@
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
- <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ <#if primaryGeo.geoName?has_content>
+ <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ </#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
(<b>${uiLabelMap.CommonIn}:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?view=diff&rev=501521&r1=501520&r2=501521
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Tue Jan 30 11:03:41 2007
@@ -98,7 +98,9 @@
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
- <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ <#if primaryGeo.geoName?has_content>
+ <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ </#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
(<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=501521&r1=501520&r2=501521
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Jan 30 11:03:41 2007
@@ -302,7 +302,9 @@
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
- <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ <#if primaryGeo.geoName?has_content>
+ <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ </#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
(<b>${uiLabelMap.CommonIn}:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])