[ofbiz-framework] branch release18.12 updated: Fixed: Overlapped labels in Accounting transaction pdf export (OFBIZ-12110)

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

[ofbiz-framework] branch release18.12 updated: Fixed: Overlapped labels in Accounting transaction pdf export (OFBIZ-12110)

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 4d97f22  Fixed: Overlapped labels in Accounting transaction pdf export (OFBIZ-12110)
4d97f22 is described below

commit 4d97f2282330e3299ce0184d41a00ab7cb2a49bb
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sun Feb 28 11:28:57 2021 +0100

    Fixed: Overlapped labels in Accounting transaction pdf export (OFBIZ-12110)
   
    1. Navigate to URL: accounting/control/FindAcctgTrans
    2. Click on search button and then click on export as pdf button
    3. Validate the export pdf file, here labels are overlapped in pdf header.
   
    Thanks: Lalit Dashora for report and enehlauri on GH with PR-281 for the fix
---
 .../order/template/order/CompanyHeader.fo.ftl      | 88 ++++++++--------------
 1 file changed, 30 insertions(+), 58 deletions(-)

diff --git a/applications/order/template/order/CompanyHeader.fo.ftl b/applications/order/template/order/CompanyHeader.fo.ftl
index ad362bf..9b3f26a 100644
--- a/applications/order/template/order/CompanyHeader.fo.ftl
+++ b/applications/order/template/order/CompanyHeader.fo.ftl
@@ -35,74 +35,46 @@ under the License.
     </#if>
 
     <#if sendingPartyTaxId?? || phone?? || email?? || website?? || eftAccount??>
-    <fo:list-block provisional-distance-between-starts=".5in">
         <#if sendingPartyTaxId??>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.PartyTaxId}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${sendingPartyTaxId}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
+            <fo:block>${uiLabelMap.PartyTaxId}: ${sendingPartyTaxId}</fo:block>
         </#if>
         <#if phone??>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonTelephoneAbbr}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block><#if phone.countryCode??>${phone.countryCode}-</#if><#if phone.areaCode??>${phone.areaCode}-</#if>${phone.contactNumber!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
+            <fo:block>${uiLabelMap.CommonTelephoneAbbr}: <#if phone.countryCode??>${phone.countryCode}-</#if><#if phone.areaCode??>${phone.areaCode}-</#if>${phone.contactNumber!}</fo:block>
         </#if>
         <#if email??>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonEmail}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${email.infoString!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
+            <fo:block>${uiLabelMap.CommonEmail}: ${email.infoString!}</fo:block>
         </#if>
         <#if website??>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonWebsite}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${website.infoString!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
+            <fo:block>${uiLabelMap.CommonWebsite}: ${website.infoString!}</fo:block>
         </#if>
         <#if eftAccount??>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonFinBankName}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${eftAccount.bankName!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonRouting}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${eftAccount.routingNumber!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
-        <fo:list-item>
-            <fo:list-item-label>
-                <fo:block>${uiLabelMap.CommonBankAccntNrAbbr}:</fo:block>
-            </fo:list-item-label>
-            <fo:list-item-body start-indent="body-start()">
-                <fo:block>${eftAccount.accountNumber!}</fo:block>
-            </fo:list-item-body>
-        </fo:list-item>
+            <fo:list-block provisional-distance-between-starts=".5in">
+                <fo:list-item>
+                    <fo:list-item-label>
+                        <fo:block>${uiLabelMap.CommonFinBankName}:</fo:block>
+                    </fo:list-item-label>
+                    <fo:list-item-body start-indent="body-start()">
+                        <fo:block>${eftAccount.bankName!}</fo:block>
+                    </fo:list-item-body>
+                </fo:list-item>
+                <fo:list-item>
+                    <fo:list-item-label>
+                        <fo:block>${uiLabelMap.CommonRouting}:</fo:block>
+                    </fo:list-item-label>
+                    <fo:list-item-body start-indent="body-start()">
+                        <fo:block>${eftAccount.routingNumber!}</fo:block>
+                    </fo:list-item-body>
+                </fo:list-item>
+                <fo:list-item>
+                    <fo:list-item-label>
+                        <fo:block>${uiLabelMap.CommonBankAccntNrAbbr}:</fo:block>
+                    </fo:list-item-label>
+                    <fo:list-item-body start-indent="body-start()">
+                        <fo:block>${eftAccount.accountNumber!}</fo:block>
+                    </fo:list-item-body>
+                </fo:list-item>
+            </fo:list-block>
         </#if>
-    </fo:list-block>
     </#if>
 </fo:block>
 </#escape>