You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/06/07 14:12:34 UTC
svn commit: r1684026 - in
/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates:
PostalAddress_NLD.fo.ftl PostalAddress_NLD.ftl
Author: jleroux
Date: Sun Jun 7 12:12:34 2015
New Revision: 1684026
URL: http://svn.apache.org/r1684026
Log:
A slightly modified patch from Pierre Smits "Adding a contactmechtemplate for the Netherlands" https://issues.apache.org/jira/browse/OFBIZ-6470
jleroux: I simply replaced "?if_exists" occurences by ! and removed a test on "?has_content" when not needed (! was enough). I will continue in the same spirit on files I committed recently (Forrest Rae's patch) and earlier
Added:
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl (with props)
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl (with props)
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl?rev=1684026&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl Sun Jun 7 12:12:34 2015
@@ -0,0 +1,29 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+ <fo:block>${postalAddress.address1!}</fo:block>
+ <fo:block>${postalAddress.address2!}</fo:block>
+ <fo:block>${postalAddress.postalCode!} ${postalAddress.city!}</fo:block>
+ <#if postalAddress.countryGeoId?has_content>
+ <fo:block>
+ <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
+ ${country.get("geoName", locale)?default(country.geoId)}
+ </fo:block>
+ </#if>
+</#escape>
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl?rev=1684026&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl Sun Jun 7 12:12:34 2015
@@ -0,0 +1,29 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+ <div>
+ <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1!}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+ ${postalAddress.postalCode!} ${postalAddress.city!}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
+ ${country.get("geoName", locale)?default(country.geoId)}
+ </#if>
+ </div>
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_NLD.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain