[ofbiz-framework] branch release17.12 updated (af5d61b -> 7933fef)
Locked
[ofbiz-framework] branch release17.12 updated (af5d61b -> 7933fef)
 
|
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from af5d61b Fixed: Bug preventing proper explosion of BOM containing virtual nodes (OFBIZ-12191) new 5560130 Fixed: createGlReconciliation throws an error (OFBIZ-10675) new 5b0b80f Fixed: createGlReconciliation throws an error (OFBIZ-10675) new 7933fef Fixed: EditFinAccountReconciliations does not work (OFBIZ-12198) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: applications/accounting/servicedef/services_ledger.xml | 10 +++++----- applications/accounting/widget/FinAccountForms.xml | 14 +++++--------- applications/accounting/widget/GlForms.xml | 6 +++--- 3 files changed, 13 insertions(+), 17 deletions(-) |
[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 <[hidden email]> 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"> |
[ofbiz-framework] 02/03: Fixed: createGlReconciliation throws an error (OFBIZ-10675)
|
|
In reply to this post by jleroux@apache.org
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 5b0b80f795dc8ad84f8c4fb2188dfcb2d2872b1c Author: Jacques Le Roux <[hidden email]> 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 ad756da..f4b91af 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=""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"> <submit button-type="button"/> diff --git a/applications/accounting/widget/GlForms.xml b/applications/accounting/widget/GlForms.xml index 5965392..b84d924 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"/> @@ -861,7 +861,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=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><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> |
[ofbiz-framework] 03/03: Fixed: EditFinAccountReconciliations does not work (OFBIZ-12198)
|
|
In reply to this post by jleroux@apache.org
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 7933fef9f2eafc91f3fe78c1e86579d5958e8d2b Author: Jacques Le Roux <[hidden email]> AuthorDate: Thu Mar 18 09:55:22 2021 +0100 Fixed: EditFinAccountReconciliations does not work (OFBIZ-12198) Like for createGlReconciliation at OFBIZ-10675 it must be that this has never been tested nor used by anybody. In relation with OFBIZ-10675, took me hours to understand that it was only missing an INOUT instead of a simple IN :/ --- applications/accounting/servicedef/services_ledger.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml index f60032a..db202a1 100644 --- a/applications/accounting/servicedef/services_ledger.xml +++ b/applications/accounting/servicedef/services_ledger.xml @@ -137,7 +137,7 @@ under the License. location="component://accounting/minilang/ledger/GeneralLedgerServices.xml" invoke="updateGlReconciliation" auth="true"> <description>Update a GlReconciliation record</description> <permission-service service-name="basicGeneralLedgerPermissionCheck" main-action="UPDATE"/> - <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="INOUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"> <exclude field-name="createdByUserLogin"/> <exclude field-name="lastModifiedByUserLogin"/> @@ -556,7 +556,7 @@ under the License. <attribute name="customTimePeriodId" mode="IN" type="String"/> <attribute name="previousTimePeriod" mode="OUT" type="Map" optional="true"/> </service> - <service name="getAcctgTransEntriesAndTransTotal" engine="simple" invoke="getAcctgTransEntriesAndTransTotal" + <service name="getAcctgTransEntriesAndTransTotal" engine="simple" invoke="getAcctgTransEntriesAndTransTotal" location="component://accounting/minilang/ledger/AcctgTransServices.xml" auth="true"> <description>Given AcctgTransAndEntire and Calculate acctg trans total for specific time period.</description> <attribute name="customTimePeriodStartDate" mode="IN" type="Timestamp"/> @@ -581,7 +581,7 @@ under the License. <attribute name="debitCreditDifference" type="BigDecimal" mode="OUT"/> </service> - <service name="revertAcctgTransOnCancelInvoice" engine="simple" + <service name="revertAcctgTransOnCancelInvoice" engine="simple" location="component://accounting/minilang/ledger/AcctgTransServices.xml" invoke="revertAcctgTransOnCancelInvoice" auth="true"> <description>Reverting Accounting Transaction And Entries on Canceling an Invoice</description> <attribute name="invoiceId" mode="IN" type="String" optional="false"/> @@ -589,7 +589,7 @@ under the License. <service name="revertAcctgTransOnRemovePaymentApplications" engine="simple" location="component://accounting/minilang/ledger/AcctgTransServices.xml" invoke="revertAcctgTransOnRemovePaymentApplications" auth="true"> <description>Create Reverse Accounting Transaction and Entries on removing PaymentApplication records.</description> - <attribute name="paymentApplicationId" mode="IN" type="String" optional="false"/> + <attribute name="paymentApplicationId" mode="IN" type="String" optional="false"/> </service> <service name="createGlAccountCategory" engine="entity-auto" default-entity-name="GlAccountCategory" invoke="create" auth="true"> @@ -656,7 +656,7 @@ under the License. <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/> </service> - <service name="createUpdateCostCenter" engine="java" auth="true" invoke="createUpdateCostCenter" + <service name="createUpdateCostCenter" engine="java" auth="true" invoke="createUpdateCostCenter" location="org.apache.ofbiz.accounting.ledger.GeneralLedgerServices"> <description>Create Update CostCenters</description> <attribute name="glAccountId" mode="IN" type="String"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |