[ofbiz-framework] branch release18.12 updated: Fixed: Error in deleting Financial Account (OFBIZ-12153)

[jleroux]

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 04ec3b3  Fixed: Error in deleting Financial Account (OFBIZ-12153)
04ec3b3 is described below

commit 04ec3b3e9e3bb83a38c88c34e6559e5ef3166c72
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Mar 1 14:25:07 2021 +0100

    Fixed: Error in deleting Financial Account (OFBIZ-12153)
    
    1. Navigate to URL: accounting/control/FindFinAccount
    2. Click on Find button. List of fin account will be displayed.
    3. Click on delete button near available balance column.
    
    Thanks: Lalit Dashora for report, Sourabh Jain for the fix
---
 applications/accounting/servicedef/services_finaccount.xml | 3 ++-
 applications/accounting/widget/FinAccountForms.xml         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/applications/accounting/servicedef/services_finaccount.xml 
b/applications/accounting/servicedef/services_finaccount.xml
index b1feeb1..f2fa26b 100644
--- a/applications/accounting/servicedef/services_finaccount.xml
+++ b/applications/accounting/servicedef/services_finaccount.xml
@@ -48,9 +48,10 @@ under the License.
         <attribute name="replenishPaymentId" type="String" mode="OUT" 
optional="true"/>
         <attribute name="replenishLevel" type="BigDecimal" mode="OUT" 
optional="true"/>
     </service>
-    <service name="deleteFinAccount" default-entity-name="FinAccount" 
engine="entity-auto" invoke="delete">
+    <service name="deleteFinAccount" default-entity-name="FinAccount" 
engine="entity-auto" invoke="update">
         <description>Delete a Financial Account</description>
         <auto-attributes mode="IN" optional="false" include="pk"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateFinAccountBalancesFromTrans" engine="simple"
         
location="component://accounting/minilang/finaccount/FinAccountServices.xml" 
invoke="updateFinAccountBalancesFromTrans">
diff --git a/applications/accounting/widget/FinAccountForms.xml 
b/applications/accounting/widget/FinAccountForms.xml
index efd67ec..953a2b4 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -76,6 +76,7 @@ under the License.
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteFinAccount" also-hidden="false">
                 <parameter param-name="finAccountId"/>
+                <parameter param-name="thruDate" value="${nowTimestamp}"/>
             </hyperlink>
         </field>
     </form>