Author: jleroux
Date: Mon Jan 4 18:16:54 2016
New Revision: 1722940
URL: http://svn.apache.org/viewvc?rev=1722940&view=rev
Log:
"Applied fix from trunk for revision: 1722712"
------------------------------------------------------------------------
r1722712 | jleroux | 2016-01-03 12:46:58 +0100 (dim. 03 janv. 2016) | 1 ligne
Fixes a bug reported by Tiwonge Kawonga on user ML
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 4 18:16:54 2016
@@ -9,3 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
+/ofbiz/trunk:1722712
Modified:
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1722940&r1=1722939&r2=1722940&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
(original)
+++
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Mon Jan 4 18:16:54 2016
@@ -252,7 +252,7 @@ partyTaxAuthInfoList = from("PartyTaxAut
.filterByDate(nowTimestamp, "fromDate", "thruDate")
.queryList();
if (partyTaxAuthInfoList) {
- if (address.countryGeoId) {
+ if (address?.countryGeoId) {
// if we have an address with country filter by that
partyTaxAuthInfoList.eachWithIndex { partyTaxAuthInfo, i ->
if (partyTaxAuthInfo.taxAuthGeoId.equals(address.countryGeoId)) {
