Author: jleroux
Date: Tue Oct 3 04:54:49 2006 New Revision: 452439 URL: http://svn.apache.org/viewvc?view=rev&rev=452439 Log: A patch from Chris Howe : formatting fix of companyheader.fo.ftl (https://issues.apache.org/jira/browse/OFBIZ-353) Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?view=diff&rev=452439&r1=452438&r2=452439 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Tue Oct 3 04:54:49 2006 @@ -48,8 +48,8 @@ <#if phone?exists> <fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.CommonTelephoneAbbr}:Tel:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${phone.countryCode?if_exists}-${phone.areaCode?if_exists}-${phone.contactNumber?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${uiLabelMap.CommonTelephoneAbbr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if phone.countryCode?exists>${phone.countryCode?if_exists}-</#if>${phone.areaCode?if_exists}-${phone.contactNumber[0..2]?if_exists}-${phone.contactNumber[3..]?if_exists}</fo:block></fo:table-cell> </fo:table-row> </#if> |
Sorry, this should probably be pulled out. This patch should have been evaluated more closely... there are assumptions in it which might be correct in the USA, but is not correct in most other countries, ie splitting the contactNumber with 3 digits and then the rest. -David On Oct 3, 2006, at 12:54 PM, [hidden email] wrote: > Author: jleroux > Date: Tue Oct 3 04:54:49 2006 > New Revision: 452439 > > URL: http://svn.apache.org/viewvc?view=rev&rev=452439 > Log: > A patch from Chris Howe : formatting fix of companyheader.fo.ftl > (https://issues.apache.org/jira/browse/OFBIZ-353) > > Modified: > incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ > companyHeader.fo.ftl > > Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/ > order/companyHeader.fo.ftl > URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/ > applications/order/webapp/ordermgr/order/companyHeader.fo.ftl? > view=diff&rev=452439&r1=452438&r2=452439 > ====================================================================== > ======== > --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ > companyHeader.fo.ftl (original) > +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ > companyHeader.fo.ftl Tue Oct 3 04:54:49 2006 > @@ -48,8 +48,8 @@ > > <#if phone?exists> > <fo:table-row> > - <fo:table-cell><fo:block>$ > {uiLabelMap.CommonTelephoneAbbr}:Tel:</fo:block></fo:table-cell> > - <fo:table-cell><fo:block>${phone.countryCode? > if_exists}-${phone.areaCode?if_exists}-${phone.contactNumber? > if_exists}</fo:block></fo:table-cell> > + <fo:table-cell><fo:block>$ > {uiLabelMap.CommonTelephoneAbbr}:</fo:block></fo:table-cell> > + <fo:table-cell><fo:block><#if > phone.countryCode?exists>${phone.countryCode?if_exists}-</#if>$ > {phone.areaCode?if_exists}-${phone.contactNumber[0..2]?if_exists}-$ > {phone.contactNumber[3..]?if_exists}</fo:block></fo:table-cell> > </fo:table-row> > </#if> > > > |
Free forum by Nabble | Edit this page |