[ofbiz-framework] 02/03: Fixed: createGlReconciliation throws an error (OFBIZ-10675)

[jleroux]

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

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

commit 3ba85315958c996c0dfc687b0e4992f8727e6da3
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Mar 18 09:48:33 2021 +0100

    Fixed: createGlReconciliation throws an error (OFBIZ-10675)
    
    
https://demo-trunk.ofbiz.apache.org/accounting/control/createGlReconciliation
    When entering an amount and submitting the data an error is thrown.
    
    jleroux:
    EditFinAccountReconciliation form extends EditGlReconciliation. There
    glReconciliationId and reconciledBalance fields are already present.
    So adding them in EditFinAccountReconciliation  is wrong. On the other hand 
the
    display of reconciledBalance is better in EditFinAccountReconciliation.
    So I moved it there.
    
    Thanks: Pierre Smits for report and Mohammed Rehan Khan for initial patch
---
 applications/accounting/widget/FinAccountForms.xml | 3 ---
 applications/accounting/widget/GlForms.xml         | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/applications/accounting/widget/FinAccountForms.xml 
b/applications/accounting/widget/FinAccountForms.xml
index 606c46e..bfb8813 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -400,11 +400,8 @@ under the License.
         </actions>
         <alt-target use-when="glReconciliationId != null" 
target="updateFinAccountGlReconciliation"/>
         <field name="finAccountId"><hidden value="${finAccountId}"/></field>
-        <field name="glReconciliationId" use-when="glReconciliationId == 
null"><ignored/></field>
-        <field name="glReconciliationId" use-when="glReconciliationId != 
null"><display/></field>
         <field name="glAccountId"><hidden 
value="${finAccount.postToGlAccountId}"/></field>
         <field name="organizationPartyId"><lookup 
target-form-name="LookupPartyName"/></field>
-        <field name="reconciledBalance" 
use-when="&quot;GLREC_RECONCILED&quot;.equals(&quot;${glReconciliation.statusId}&quot;)"><display
 type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field>
         <field name="reconciledDate" 
title="${uiLabelMap.AccountingReconciliationDate}"><date-time/></field>
         <field name="createButton" use-when="glReconciliationId == null" 
widget-style="smallSubmit">
             <submit button-type="button"/>
diff --git a/applications/accounting/widget/GlForms.xml 
b/applications/accounting/widget/GlForms.xml
index 1f7d935..e942272 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.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="FindAcctgTrans" target="FindAcctgTrans" type="single" title="" 
default-map-name="journal"
@@ -763,7 +763,7 @@ under the License.
         <field name="description"><textarea/></field>
         <field name="createButton" widget-style="smallSubmit"><submit 
button-type="button"/></field>
         <sort-order>
-            <sort-field name="organizationPartyId"/>        
+            <sort-field name="organizationPartyId"/>
             <sort-field name="acctgTransTypeId"/>
             <sort-field name="glFiscalTypeId"/>
             <sort-field name="glJournalId"/>
@@ -862,7 +862,7 @@ under the License.
         </field>
         <field name="reconciledDate"><date-time/></field>
         <field name="organizationPartyId"><display/></field>
-        <field name="reconciledBalance"><display/></field>
+        <field name="reconciledBalance" 
use-when="&quot;GLREC_RECONCILED&quot;.equals(&quot;${glReconciliation.statusId}&quot;)"><display
 type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field>
         <field name="openingBalance" 
use-when="${groovy:'GLREC_RECONCILED'.equals(glReconciliation?.statusId)}"><display/></field>
         <field use-when="glReconciliationId!=null" name="updateButton" 
title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit 
button-type="text-link"/></field>
     </form>