[ofbiz-framework] branch release17.12 updated: Fixed: Label issue on List Companies page (OFBIZ-12023)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/release17.12 by this push:
     new aaed04d  Fixed: Label issue on List Companies page (OFBIZ-12023)
aaed04d is described below

commit aaed04d7c8375dabfcae2ab754dd7a87eb4afa3d
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Dec 8 09:39:30 2020 +0100

    Fixed: Label issue on List Companies page (OFBIZ-12023)
    
    Navigate to URL: 'accounting/control/ListCompanies'
    Under the companies list, the 2nd column has button for account
    The System is not showing proper label in French.
    
    This issue is occurring due to the hyperlink title is not supporting 
character
    encoding for special characters. Please track progress under OFBIZ-12026.
---
 applications/accounting/widget/GlSetupForms.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/accounting/widget/GlSetupForms.xml 
b/applications/accounting/widget/GlSetupForms.xml
index d305334..ff70d33 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
         xmlns="http://ofbiz.apache.org/Widget-Form"; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form 
http://ofbiz.apache.org/dtds/widget-form.xsd";>
 
     <form name="ListCompanies" type="list" title="Internal Organizations" 
list-name="parties"
@@ -30,7 +30,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="accounting" title=" " use-when="hasBasicPermission" 
widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.AccountingAccounting}" 
target="PartyAccountsSummary">
+            <hyperlink description="${uiLabelMap.AccountingAccounting}" 
target="PartyAccountsSummary" target-type="plain">
                 <parameter param-name="organizationPartyId" 
from-field="partyId"/>
             </hyperlink>
         </field>
@@ -370,7 +370,7 @@ under the License.
         </field>
         <field name="errorGlJournalId" tooltip="${groovy: import 
org.apache.ofbiz.base.util.UtilProperties;
             
if((partyAcctgPreference==null&amp;&amp;aggregatedPartyAcctgPreference!= 
null&amp;&amp;aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null) ||
-            
(partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('errorGlJournalId')==null&amp;&amp;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
 
+            
(partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('errorGlJournalId')==null&amp;&amp;aggregatedPartyAcctgPreference!=
 
null&amp;&amp;aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
             (UtilProperties.getMessage('AccountingUiLabels', 
'AccountingInheritedValue', locale))}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="GlJournal" 
key-field-name="glJournalId" description="${glJournalName} [${glJournalId}]">
@@ -1103,7 +1103,7 @@ under the License.
         <field name="glAccountClassId"><display-entity 
entity-name="GlAccountClass" key-field-name="glAccountClassId"/></field>
         <field name="glResourceTypeId"><display-entity 
entity-name="GlResourceType" key-field-name="glResourceTypeId"/></field>
         <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass" 
key-field-name="glXbrlClassId"/></field>
-        <field name="parentGlAccountId"><display-entity 
entity-name="GlAccount" key-field-name="glAccountId" 
description="${parentGlAccountId}"/></field>            
+        <field name="parentGlAccountId"><display-entity 
entity-name="GlAccount" key-field-name="glAccountId" 
description="${parentGlAccountId}"/></field>
         <field name="accountCode" ><display-entity entity-name="GlAccount" 
key-field-name="glAccountId" description="${accountCode}"/></field>
         <field name="accountName" ><display-entity entity-name="GlAccount" 
key-field-name="glAccountId" description="${accountName}"/></field>
         <field name="description"><display 
description="${description}"/></field>