Merged revision(s) 1547657 from ofbiz/branches/release13.07:
Fixed some flawed conditional logic introduced in rev 1488656.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547673 13f79535-47bb-0310-9956-ffa450edef68