svn commit: r1747545 - /ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1747545 - /ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl

jleroux@apache.org
Author: jleroux
Date: Thu Jun  9 13:05:37 2016
New Revision: 1747545

URL: http://svn.apache.org/viewvc?rev=1747545&view=rev
Log:
Backports r1747515 by hand for "Problem in Print Pick Sheet functionality" - https://issues.apache.org/jira/browse/OFBIZ-7200

R14 and R13 are not concerned, all tested by hand

Modified:
    ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl

Modified: ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=1747545&r1=1747544&r2=1747545&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original)
+++ ofbiz/branches/release15.12/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Thu Jun  9 13:05:37 2016
@@ -94,6 +94,8 @@ under the License.
                                                                                  <fo:block> ${billAddress.countryGeoId!}</fo:block>
                                                                                  <fo:block> ${billAddress.postalCode!}</fo:block>
                                                                                  <fo:block> ${billAddress.stateProvinceGeoId!}</fo:block>
+                                                                             <#else>
+                                                                                <fo:block></fo:block>
                                                                              </#if>
                                                                          </fo:table-cell>
                                                                      </fo:table-row>
@@ -114,7 +116,7 @@ under the License.
                                      <fo:table-column column-width="50pt"/>
                                      <fo:table-body>
                                           <fo:table-row>
-                                             <fo:table-cell></fo:table-cell>
+                                             <fo:table-cell><fo:block></fo:block></fo:table-cell>
                                              <fo:table-cell padding="2pt">
                                                  <fo:table table-layout="fixed" border-width="1pt" border-style="solid">
                                                      <fo:table-column column-width="150pt"/>