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 10:09:50 UTC
svn commit: r1684000 - in /ofbiz/branches/release13.07: ./
applications/party/webapp/partymgr/party/contactmechtemplates/
applications/party/widget/partymgr/
Author: jleroux
Date: Sun Jun 7 08:09:49 2015
New Revision: 1684000
URL: http://svn.apache.org/r1684000
Log:
"Applied fix from trunk for revision: 1683998 " (conflicts handled by hand)
------------------------------------------------------------------------
r1683998 | jleroux | 2015-06-07 10:05:25 +0200 (dim. 07 juin 2015) | 10 lignes
A patch from Martin Becker "Postal Address PDF Formatter Screen Problems" https://issues.apache.org/jira/browse/OFBIZ-6444
A couple updates are needed to the postalAddressPdfFormatter screen:
First, the screen template is set to use the HTML renderer which results in this error in the log:
[java] 2015-06-03 13:44:53,400 |0.0.0.0-8009-exec-13 |ModelScreenWidget |W| In platform-dependent could not find template for xsl-fo, using the one for html.
Second, the various PostalAddressXXXX.fo.ftl files do not escape XML properly, and addresses with an & in them end up causing a FreeMarker template error.
Test: For number 1, just get a "Report" for a quote, and then look at your log file. For number 2, add an "General Correspondence" address to a party that contains an ampersand, like "5th & Oak Street", create a quote for that Party, and then get the "Report" for that quote.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl
ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl
ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl
ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyScreens.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 7 08:09:49 2015
@@ -5,4 +5,4 @@
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release12.04:1557118
-/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,
1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122
02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,16
64604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415
+/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,
1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122
02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,16
64604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998
Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl?rev=1684000&r1=1683999&r2=1684000&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl Sun Jun 7 08:09:49 2015
@@ -16,6 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
<fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block>
@@ -25,3 +26,4 @@ under the License.
${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
+</#escape>
Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl?rev=1684000&r1=1683999&r2=1684000&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl Sun Jun 7 08:09:49 2015
@@ -16,6 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+<#escape x as x?xml>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
<fo:block>${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists}</fo:block>
@@ -25,3 +26,4 @@ under the License.
${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
+</#escape>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl?rev=1684000&r1=1683999&r2=1684000&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl Sun Jun 7 08:09:49 2015
@@ -16,12 +16,15 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
- <fo:block>${postalAddress.address1?if_exists}</fo:block>
- <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block>
+<#escape x as x?xml>
+ <fo:block>${postalAddress.address1!}</fo:block>
+ <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
+ <fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</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>
+
Modified: ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyScreens.xml?rev=1684000&r1=1683999&r2=1684000&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/release13.07/applications/party/widget/partymgr/PartyScreens.xml Sun Jun 7 08:09:49 2015
@@ -1296,9 +1296,9 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html>
+ <xsl-fo>
<html-template location="component://party/webapp/partymgr/party/contactmechtemplates/${postalAddressTemplate}"/>
- </html>
+ </xsl-fo>
</platform-specific>
</widgets>
</section>