Author: doogie
Date: Tue Oct 20 17:03:21 2009
New Revision: 827733
URL: http://svn.apache.org/viewvc?rev=827733&view=rev
Log:
Applied fix from trunk for revision: 827730
Modified:
ofbiz/branches/release4.0/ (props changed)
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/branches/release4.0/mergefromtrunk.sh
Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 20 17:03:21 2009
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731
+/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730
Modified:
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderlist.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=827733&r1=827732&r2=827733&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderlist.ftl
(original)
+++
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderlist.ftl
Tue Oct 20 17:03:21 2009
@@ -194,9 +194,13 @@
<#assign billToPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId,
"compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
<#assign billTo =
billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
<#-- <#assign billTo =
Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty,
true)?if_exists> -->
+ <#else>
+ <#assign billTo = ''/>
</#if>
<#if billFromParty?has_content>
<#assign billFrom =
Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty,
true)?if_exists>
+ <#else>
+ <#assign billFrom = ''/>
</#if>
<tr><td colspan="9"><hr class="sepbar"/></td></tr>
<tr>
Modified: ofbiz/branches/release4.0/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.sh?rev=827733&r1=827732&r2=827733&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.sh (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.sh Tue Oct 20 17:03:21 2009
@@ -1,5 +1,5 @@
#!/bin/sh
-
+set -e
prevRev=`expr $1 - 1`
svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk
svn commit -m "Applied fix from trunk for revision: $1"
