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 2021/03/18 09:25:16 UTC
[ofbiz-framework] 01/03: Fixed: createGlReconciliation throws an
error (OFBIZ-10675)
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
commit 5560130451a23fb8b4cd99f66ba33fd408132bd9
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Wed Mar 17 10:28:49 2021 +0100
Fixed: createGlReconciliation throws an error (OFBIZ-10675)
See accounting/control/EditFinAccountReconciliations?finAccountId=ABN_CHECKING
Removes the unwanted condition to include duplicate reconciledBalance filed
which was the cause of the issue.
Thanks: Pierre Smits for report, Mohammed Rehan Khan for the fix
---
applications/accounting/widget/FinAccountForms.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index bb9fcaa..ad756da 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.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="FindFinAccounts" type="single" target="FindFinAccount"
@@ -336,7 +336,7 @@ under the License.
<field name="glReconciliationId" position="2">
<drop-down allow-empty="true">
<option key="_NA_" description="${uiLabelMap.CommonNotAssigned}"/>
- <list-options list-name="glReconciliations" key-name="glReconciliationId"
+ <list-options list-name="glReconciliations" key-name="glReconciliationId"
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
</drop-down>
</field>
@@ -346,17 +346,17 @@ under the License.
<field name="thruEntryDate" position="2"><date-time/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FindBankReconciliationFinAcctTrans" target="BankReconciliation"
+ <form name="FindBankReconciliationFinAcctTrans" target="BankReconciliation"
extends="FindFinAccountTransactions">
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="glReconciliationId" position="2">
<drop-down>
- <list-options list-name="glReconciliations" key-name="glReconciliationId"
+ <list-options list-name="glReconciliations" key-name="glReconciliationId"
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
</drop-down>
</field>
</form>
- <form name="EditDepositPayment" extends="EditPayment"
+ <form name="EditDepositPayment" extends="EditPayment"
extends-resource="component://accounting/widget/PaymentForms.xml" target="createDepositPayment">
<actions>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
@@ -404,7 +404,6 @@ under the License.
<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="${reconciledBalance == null}"><hidden/></field>
<field name="reconciledBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><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">