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 b4e470cfab Improved: Remove main.ftl from accounting main screen
(OFBIZ-13014) (#753)
b4e470cfab is described below
commit b4e470cfaba0485addf32c0401d0cf71bf70d25d
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Sat Apr 13 08:49:30 2024 +0200
Improved: Remove main.ftl from accounting main screen (OFBIZ-13014) (#753)
The main.ftl element in the main screen of accountant delivers a lot of
action triggers, which - in essence - deliver the same functionality as the
main menu of the application and points to the same elements as the main menu.
modified:
- CommonScreens.xml - Removed entity-conditions for main.ftl. Removed
screenlet and reference to main.ftl
removed: main.ftl
---
applications/accounting/template/Main.ftl | 123 -----------------------
applications/accounting/widget/CommonScreens.xml | 20 ----
2 files changed, 143 deletions(-)
diff --git a/applications/accounting/template/Main.ftl
b/applications/accounting/template/Main.ftl
deleted file mode 100644
index 1615020afe..0000000000
--- a/applications/accounting/template/Main.ftl
+++ /dev/null
@@ -1,123 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div>
-<table>
- <tr>
- <td colspan="3"><h1>${uiLabelMap.AccountingAgreements}</h1></td>
- </tr>
-
- <tr>
- <td colspan="3">
-<ul>
-<li><a
href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreementAvailable}</a></li>
-</ul>
-<br />
- </td>
- </tr>
- <tr>
- <td colspan="3"><h1
class="h1">${uiLabelMap.AccountingBillingMenu}</h1></td>
- </tr>
-
- <tr>
- <td colspan="3">
-<ul>
-<li><a
href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">${uiLabelMap.CommonShow}
${uiLabelMap.AccountingCustomer} ${uiLabelMap.AccountingBillingAccount}</a></li>
-</ul>
-<br />
- </td>
- </tr>
-
- <tr>
- <td colspan="3"><h1
class="h1">${uiLabelMap.AccountingFixedAssets}</h1></td>
- </tr>
-
- <tr>
- <td colspan="3">
-<ul>
-<li><a
href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingShowAllFixedAssets}</a></li>
-</ul>
-<br />
- </td>
- </tr>
-
- <tr>
- <td colspan="3"><h1
class="h1">${uiLabelMap.AccountingInvoicesMenu}</h1></td>
- </tr>
-
- <tr valign="top">
-<td>
-<ul>
-<li><a
href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li>
-</ul>
-</td>
-
-<td>
-<ul>
-<#list invoiceTypes as invoiceType>
-<li><a
href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices}
${invoiceType.get("description",locale)!invoiceType.invoiceTypeId}</a></li>
-</#list>
-</ul>
-</td>
-<td>
-<ul>
-<#list invoiceStatus as status>
-<li><a
href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices}
${status.get("description",locale)!status.statusId}</a></li>
-</#list>
-</ul>
-</td>
-</tr>
-
- <tr>
- <td colspan="3"><h1
class="h1">${uiLabelMap.AccountingPaymentsMenu}</h1></td>
- </tr>
-
-<tr valign="top">
-<td>
-<ul>
-<li><a
href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li>
-</ul>
-</td>
-<td>
-
-<ul>
-<#list paymentTypes as paymentType>
-<li><a
href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments}
${paymentType.get("description",locale)!paymentType.paymentTypeId}</a></li>
-</#list>
-</ul>
-</td>
-
-
-<td>
-<ul>
-<#list paymentMethodTypes as paymentMethodType>
-<li><a
href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments}
${paymentMethodType.get("description",locale)!paymentMethodType.paymentMethodTypeId}</a></li>
-</#list>
-</ul>
-</td>
-
-<td>
-<ul>
-<#list paymentStatus as status>
-<li><a
href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments}
${status.get("description",locale)!status.statusId}</a></li>
-</#list>
-</ul>
-</td>
-</tr>
-</table>
-</div>
diff --git a/applications/accounting/widget/CommonScreens.xml
b/applications/accounting/widget/CommonScreens.xml
index 076f33b4fe..ef97cdd420 100644
--- a/applications/accounting/widget/CommonScreens.xml
+++ b/applications/accounting/widget/CommonScreens.xml
@@ -280,23 +280,6 @@ under the License.
<set field="helpAnchor"
value="_help_for_accounting_main_screen"/>
<set field="parameters.parentPortalPageId"
from-field="parameters.parentPortalPageId" default-value="ACC_MAIN"
global="true"/>
<script
location="component://common/src/main/groovy/org/apache/ofbiz/common/GetParentPortalPageId.groovy"/>
- <entity-condition entity-name="PaymentType"
list="paymentTypes">
- <order-by field-name="paymentTypeId"/>
- </entity-condition>
- <entity-condition entity-name="InvoiceType"
list="invoiceTypes">
- <order-by field-name="invoiceTypeId"/>
- </entity-condition>
- <entity-condition entity-name="PaymentMethodType"
list="paymentMethodTypes">
- <order-by field-name="paymentMethodTypeId"/>
- </entity-condition>
- <entity-condition entity-name="StatusItem"
list="invoiceStatus">
- <condition-expr field-name="statusTypeId"
operator="equals" value="INVOICE_STATUS"/>
- <order-by field-name="statusId"/>
- </entity-condition>
- <entity-condition entity-name="StatusItem"
list="paymentStatus">
- <condition-expr field-name="statusTypeId"
operator="equals" value="PMNT_STATUS"/>
- <order-by field-name="statusId"/>
- </entity-condition>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -305,9 +288,6 @@ under the License.
</decorator-section>
<decorator-section name="body">
<include-portal-page id="${parameters.portalPageId}"/>
- <screenlet title="${uiLabelMap.AccountingMainPage}">
- <platform-specific><html><html-template
location="component://accounting/template/Main.ftl"/></html></platform-specific>
- </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
