diff --git a/applications/accounting/config/AccountingUiLabels.properties b/applications/accounting/config/AccountingUiLabels.properties index fbc9c8e189..c9b28fa92b 100644 --- a/applications/accounting/config/AccountingUiLabels.properties +++ b/applications/accounting/config/AccountingUiLabels.properties @@ -230,6 +230,7 @@ AccountingGlAccountClass=GL Account Class AccountingGlAccountDefault=GL Account defaults AccountingGlAccountId=GL Account ID AccountingGlAccountTypeDefaults=GL Account Type Defaults +AccountingGlobalGLSettings=Global GL Settings AccountingGlJournals=Journals AccountingInvoiceHeaderDetailedInformation=Header Detailed Information AccountingHideFields=Hide Fields diff --git a/applications/accounting/webapp/accounting/WEB-INF/controller.xml b/applications/accounting/webapp/accounting/WEB-INF/controller.xml index 895f6e324f..dcf3d2be8d 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/controller.xml +++ b/applications/accounting/webapp/accounting/WEB-INF/controller.xml @@ -1676,6 +1676,12 @@ under the License. + + + + + + diff --git a/applications/accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl b/applications/accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl new file mode 100644 index 0000000000..acc5bed027 --- /dev/null +++ b/applications/accounting/webapp/accounting/chartofaccounts/GlSettingTabBar.ftl @@ -0,0 +1,27 @@ +<#-- +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. +--> + +<#assign selected = page.tabButtonItem2?default("void")> +
+ +
+
\ No newline at end of file diff --git a/applications/accounting/webapp/accounting/includes/appheader.ftl b/applications/accounting/webapp/accounting/includes/appheader.ftl index c584a6f490..e5007eab35 100644 --- a/applications/accounting/webapp/accounting/includes/appheader.ftl +++ b/applications/accounting/webapp/accounting/includes/appheader.ftl @@ -33,11 +33,8 @@ under the License. class="selected">${uiLabelMap.AccountingTaxAuthorities} class="selected">${uiLabelMap.AccountingAgreements} class="selected">${uiLabelMap.AccountingFixedAssets} - class="selected">${uiLabelMap.AccountingChartOfAcctsMenu} class="selected">${uiLabelMap.AccountingGeneralLedger} - class="selected">${uiLabelMap.ManufacturingCostCalcs} - class="selected">${uiLabelMap.AccountingPaymentMethodType} - class="selected">${uiLabelMap.AccountingInvoiceItemType} + class="selected">${uiLabelMap.AccountingGlobalGLSettings} <#if userLogin?has_content>
  • ${uiLabelMap.CommonLogout}
  • <#else> diff --git a/applications/accounting/widget/CommonScreens.xml b/applications/accounting/widget/CommonScreens.xml index 71d0e03b27..c7c5213640 100644 --- a/applications/accounting/widget/CommonScreens.xml +++ b/applications/accounting/widget/CommonScreens.xml @@ -319,5 +319,27 @@ under the License. - + + +
    + + + + + + +
    + + + + + +
    + +
    +
    +
    +
    +
    + diff --git a/applications/accounting/widget/CostScreens.xml b/applications/accounting/widget/CostScreens.xml index b75994469e..ed931c230f 100644 --- a/applications/accounting/widget/CostScreens.xml +++ b/applications/accounting/widget/CostScreens.xml @@ -26,8 +26,8 @@ under the License. + - @@ -35,7 +35,7 @@ under the License. - + diff --git a/applications/accounting/widget/GlobalGlAccountsScreens.xml b/applications/accounting/widget/GlobalGlAccountsScreens.xml index a8aadea009..62a257bf6b 100644 --- a/applications/accounting/widget/GlobalGlAccountsScreens.xml +++ b/applications/accounting/widget/GlobalGlAccountsScreens.xml @@ -99,16 +99,25 @@ under the License.
    - - - + + - + +
    + + + + + + + + +
    @@ -120,9 +129,9 @@ under the License.
    - - - + + + @@ -134,8 +143,15 @@ under the License. +
    + + + + + +
    - + @@ -225,8 +241,8 @@ under the License.
    - + @@ -234,8 +250,14 @@ under the License. - + + + + + + + diff --git a/applications/accounting/widget/InvoiceItemTypeScreens.xml b/applications/accounting/widget/InvoiceItemTypeScreens.xml index 3093fd3c35..1ba4d72c37 100644 --- a/applications/accounting/widget/InvoiceItemTypeScreens.xml +++ b/applications/accounting/widget/InvoiceItemTypeScreens.xml @@ -25,7 +25,7 @@ under the License.
    - + @@ -33,7 +33,7 @@ under the License. - + diff --git a/applications/accounting/widget/Menus.xml b/applications/accounting/widget/Menus.xml index ac191f0314..788f4d1f85 100644 --- a/applications/accounting/widget/Menus.xml +++ b/applications/accounting/widget/Menus.xml @@ -515,5 +515,20 @@ under the License. + + + + + + + + + + + + + + + diff --git a/applications/accounting/widget/PaymentMethodTypeScreens.xml b/applications/accounting/widget/PaymentMethodTypeScreens.xml index 422c76c5ce..14944aedfd 100644 --- a/applications/accounting/widget/PaymentMethodTypeScreens.xml +++ b/applications/accounting/widget/PaymentMethodTypeScreens.xml @@ -24,16 +24,16 @@ under the License.
    + - - +