Applied fix from trunk for revision: 827730

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release4.0@827733 13f79535-47bb-0310-9956-ffa450edef68

applications/order/webapp/ordermgr/order/orderlist.ftl

@@ -194,9 +194,13 @@ under the License.
                     <#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>

mergefromtrunk.sh

@@ -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"