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

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 69f00cf  Revert "Fixed: Error in deleting Financial Account (OFBIZ-12153)"
69f00cf is described below

commit 69f00cff7876f698c57be1ed6af5befe49acf629
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Fri Mar 5 06:20:03 2021 +0100

    Revert "Fixed: Error in deleting Financial Account (OFBIZ-12153)"
   
    This reverts commit 2876adf26cb3c4f9c9a2ffebeec501322cb0d0d7.
---
 applications/accounting/servicedef/services_finaccount.xml | 3 +--
 applications/accounting/widget/FinAccountForms.xml         | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/applications/accounting/servicedef/services_finaccount.xml b/applications/accounting/servicedef/services_finaccount.xml
index f2fa26b..b1feeb1 100644
--- a/applications/accounting/servicedef/services_finaccount.xml
+++ b/applications/accounting/servicedef/services_finaccount.xml
@@ -48,10 +48,9 @@ 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="update">
+    <service name="deleteFinAccount" default-entity-name="FinAccount" engine="entity-auto" invoke="delete">
         <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 953a2b4..efd67ec 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -76,7 +76,6 @@ 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>