Hi Jacques,
I didn't get the logic behind this commit.
{code}
<row-actions>
+ <entity-one entity-name="PaymentType"
value-field="paymentType"/>
+ <set field="paymentTypeId"
from-field="paymentType.parentTypeId"/>
+ <entity-one entity-name="PaymentType"
value-field="parentPaymentType"/>
+ </row-actions>
<field name="typeDescription" title="${uiLabelMap.CommonType}">
+ <display description="${paymentType.description}"/>
</field>
{code}
Why are we fetching parentPaymentType?
As we are using paymentType.description for display, same as other fields
as well.
This is not used anywhere in the code. Ideally we should use the cache as
well, as type data does not change.
Please correct me if I am missing something!!
It'd be good to revert this commit.
Thanks & Regards
--
Deepak Dixit
ofbiz.apache.org
On Thu, May 30, 2024 at 3:03 PM <jler...@apache.org> wrote:
> 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
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
> new 6718c4645d Fixed: PartyFinancialHistory shows parentTypeId of
> invoice, not invoiceTypeId (OFBIZ-13068)
> 6718c4645d is described below
>
> commit 6718c4645dba7195317de3084cf2a24116f7dfdc
> Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
> AuthorDate: Thu May 30 11:33:08 2024 +0200
>
> Fixed: PartyFinancialHistory shows parentTypeId of invoice, not
> invoiceTypeId (OFBIZ-13068)
>
> This fixes an old bug (at least 8 years)
> ---
> applications/party/widget/partymgr/PartyForms.xml | 36
> +++++++++++++++--------
> 1 file changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/applications/party/widget/partymgr/PartyForms.xml
> b/applications/party/widget/partymgr/PartyForms.xml
> index 7ba6d88410..4eaa195d72 100644
> --- a/applications/party/widget/partymgr/PartyForms.xml
> +++ b/applications/party/widget/partymgr/PartyForms.xml
> @@ -1099,6 +1099,9 @@ under the License.
> <set field="total"
> value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,
> invoiceId, actualCurrency)}"/>
> <set field="amountToApply"
> value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId,
> actualCurrency)}"/>
> <set field="amountApplied"
> value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(delegator,invoiceId,
> org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/>
> + <entity-one entity-name="InvoiceType"
> value-field="invoiceType"/>
> + <set field="invoiceTypeId"
> from-field="invoiceType.parentTypeId"/>
> + <entity-one entity-name="InvoiceType"
> value-field="parentInvoiceType"/>
> </row-actions>
> <field name="invoiceId">
> <display-entity entity-name="Invoice" description=" "
> also-hidden="true">
> @@ -1107,7 +1110,9 @@ under the License.
> </sub-hyperlink>
> </display-entity>
> </field>
> - <field name="invoiceTypeId"><display-entity
> entity-name="InvoiceType"/></field>
> + <field name="typeDescription" title="${uiLabelMap.CommonType}">
> + <display description="${invoiceType.description}"/>
> + </field>
> <field name="invoiceDate"><display type="date"/></field>
> <field name="total"><display type="currency"
> currency="${actualCurrencyUomId}"/></field>
> <field name="amountToApply"><display type="currency"
> currency="${actualCurrencyUomId}"/></field>
> @@ -1131,15 +1136,18 @@ under the License.
> <set field="actualCurrency" from-field="actualCurrency"
> default-value="true" type="Boolean"/>
> <script
> location="component://party/src/main/groovy/org/apache/ofbiz/party/party/UnAppliedInvoicesForParty.groovy"/>
> </actions>
> + <row-actions>
> + <entity-one entity-name="InvoiceType"
> value-field="invoiceType"/>
> + <set field="invoiceTypeId"
> from-field="invoiceType.parentTypeId"/>
> + <entity-one entity-name="InvoiceType"
> value-field="parentInvoiceType"/>
> + </row-actions>
> <field name="invoiceId">
> - <display-entity entity-name="Invoice">
> - <sub-hyperlink target="/accounting/control/viewInvoice"
> description="[${invoiceId}]" target-type="inter-app">
> - <parameter param-name="invoiceId"/>
> - </sub-hyperlink>
> - </display-entity>
> + <hyperlink target="/accounting/control/viewInvoice"
> description="[${invoiceId}]" target-type="inter-app">
> + <parameter param-name="invoiceId"/>
> + </hyperlink>
> </field>
> - <field name="invoiceParentTypeId">
> - <display-entity entity-name="InvoiceType"
> key-field-name="invoiceTypeId"/>
> + <field name="typeDescription" title="${uiLabelMap.CommonType}">
> + <display description="${invoiceType.description}"/>
> </field>
> <field name="invoiceDate"><display type="date"/></field>
> <field name="amount"><display type="currency"
> currency="${invoiceCurrencyUomId}"/></field>
> @@ -1153,6 +1161,11 @@ under the License.
> <set field="actualCurrency" from-field="actualCurrency"
> default-value="true" type="Boolean"/>
> <script
> location="component://party/src/main/groovy/org/apache/ofbiz/party/party/UnAppliedPaymentsForParty.groovy"/>
> </actions>
> + <row-actions>
> + <entity-one entity-name="PaymentType"
> value-field="paymentType"/>
> + <set field="paymentTypeId"
> from-field="paymentType.parentTypeId"/>
> + <entity-one entity-name="PaymentType"
> value-field="parentPaymentType"/>
> + </row-actions>
> <field name="paymentId"><hidden/></field>
> <field name="paymentId">
> <display-entity entity-name="Payment" description=" ">
> @@ -1162,11 +1175,8 @@ under the License.
> </display-entity>
> </field>
> <field name="effectiveDate"><display type="date"/></field>
> - <field name="paymentTypeId">
> - <display-entity entity-name="PaymentType"/>
> - </field>
> - <field name="paymentParentTypeId">
> - <display-entity entity-name="PaymentType"
> key-field-name="paymentTypeId"/>
> + <field name="typeDescription" title="${uiLabelMap.CommonType}">
> + <display description="${paymentType.description}"/>
> </field>
> <field name="amount"><display type="currency"
> currency="${paymentCurrencyUomId}"/></field>
> <field name="unAppliedAmount"><display type="currency"
> currency="${paymentCurrencyUomId}"/></field>
>
>
