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 6375259170 Revert "Improved: Accounting main screen is little slow
because of loading groovy script 4 times. (OFBIZ-13166)"
6375259170 is described below
commit 63752591708484ad95074b71db376870d0f436ff
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Nov 4 06:14:25 2024 +0100
Revert "Improved: Accounting main screen is little slow because of loading
groovy script 4 times. (OFBIZ-13166)"
This reverts commit 272c7130b95f3e1bda75c27d2af79510df0abb23.
It was not a good idea. All calls to InvoiceReport.groovy are needed.
In InvoiceReport PastDueInvoices and InvoicesDueSoon are not calculated
the same. Moreover loading InvoiceReport is negligible compared to services
calls
---
applications/accounting/data/AccountingPortletData.xml | 1 -
applications/accounting/widget/InvoiceScreens.xml | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/applications/accounting/data/AccountingPortletData.xml
b/applications/accounting/data/AccountingPortletData.xml
index 615b663f9f..810e2da32e 100644
--- a/applications/accounting/data/AccountingPortletData.xml
+++ b/applications/accounting/data/AccountingPortletData.xml
@@ -92,7 +92,6 @@
<PortalPage portalPageId="ACC_MAIN" portalPageName="Accounting Main Page"
description="The main portal page of the Accounting application"
ownerUserLoginId="_NA_" sequenceNum="1"/>
<PortalPageColumn columnSeqId="00001" portalPageId="ACC_MAIN"/>
<PortalPageColumn columnSeqId="00002" portalPageId="ACC_MAIN"/>
- <!-- Beware the loading order is defined below and should not be changed
because invoiceTypeId is needed for each type, see OFBIZ-13166-->
<PortalPagePortlet columnSeqId="00001" portalPageId="ACC_MAIN"
portalPortletId="InvoiceArPastDue" portletSeqId="00001" sequenceNum="1"/>
<PortalPagePortlet columnSeqId="00001" portalPageId="ACC_MAIN"
portalPortletId="InvoiceArDueSoon" portletSeqId="00002" sequenceNum="2"/>
<PortalPagePortlet columnSeqId="00002" portalPageId="ACC_MAIN"
portalPortletId="InvoiceApPastDue" portletSeqId="00003" sequenceNum="1"/>
diff --git a/applications/accounting/widget/InvoiceScreens.xml
b/applications/accounting/widget/InvoiceScreens.xml
index 94fed94baa..b93e852c75 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -361,7 +361,7 @@ under the License.
<section>
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
- <!-- <set field="invoiceTypeId" value="SALES_INVOICE"/> -->
+ <set field="invoiceTypeId" value="SALES_INVOICE"/>
<set field="organizationPartyId"
from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
<script
location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceReport.groovy"/>
<set field="invoices" from-field="InvoicesDueSoon"/>
@@ -393,7 +393,7 @@ under the License.
<section>
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
- <!-- <set field="invoiceTypeId" value="PURCHASE_INVOICE"/> -->
+ <set field="invoiceTypeId" value="PURCHASE_INVOICE"/>
<set field="organizationPartyId"
from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
<script
location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceReport.groovy"/>
<set field="invoices" from-field="InvoicesDueSoon"/>
