You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by da...@apache.org on 2023/03/14 07:15:36 UTC
[ofbiz-framework] 02/02: Fixed: PDF Trial Balance header row styling (OFBIZ-12776)
This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 0d302d7d01cc04f51cf29a318c10c6d70539ef4e
Author: Daniel Watford <da...@watfordconsulting.com>
AuthorDate: Mon Mar 13 22:46:31 2023 +0000
Fixed: PDF Trial Balance header row styling (OFBIZ-12776)
Trial Balance PDF rendering shows the selected time period rather than
listing all selectable time periods from the Trial Balance form.
The renderDropDown macros for PDF and CSV form renderers have been
updated to match the same macro for the HTML renderer, ensuring that all
expected macros are defined.
Added cell outline for Account Name column header.
(cherry picked from commit 7f5d08b252a68f37f445c6cac1ba95ea4c548504)
---
applications/accounting/widget/ReportFinancialSummaryForms.xml | 2 +-
applications/accounting/widget/ReportFinancialSummaryScreens.xml | 7 +++++--
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/applications/accounting/widget/ReportFinancialSummaryForms.xml b/applications/accounting/widget/ReportFinancialSummaryForms.xml
index acc557b462..76cc595d7b 100644
--- a/applications/accounting/widget/ReportFinancialSummaryForms.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryForms.xml
@@ -579,7 +579,7 @@ under the License.
<parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
- <field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field>
+ <field name="accountName" title-area-style="tableheadwide listtitlestyle"><display description="${accountName}"/></field>
<field name="openingBalance" title="${uiLabelMap.AccountingOpeningBalance}" widget-style="tabletextright"><display description="${openingBalance}" type="currency" currency="${currencyUomId}"/></field>
<field name="postedDebits" title="${uiLabelMap.AccountingDebitFlag}" widget-style="tabletextright"><display description="${postedDebits}" type="currency" currency="${currencyUomId}"/></field>
<field name="postedCredits" title="${uiLabelMap.AccountingCreditFlag}" widget-style="tabletextright"><display description="${postedCredits}" type="currency" currency="${currencyUomId}"/></field>
diff --git a/applications/accounting/widget/ReportFinancialSummaryScreens.xml b/applications/accounting/widget/ReportFinancialSummaryScreens.xml
index 6242ca1fb9..34c6bd82f0 100644
--- a/applications/accounting/widget/ReportFinancialSummaryScreens.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryScreens.xml
@@ -304,18 +304,21 @@ under the License.
<condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
</entity-condition>
<set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ <entity-one entity-name="CustomTimePeriod" value-field="customTimePeriod" auto-field-map="true" use-cache="true"/>
<script location="component://accounting/groovyScripts/reports/TrialBalance.groovy"/>
</actions>
<widgets>
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <container style="h3">
+ <container style="h1">
<label text="${uiLabelMap.AccountingTrialBalance}"/>
</container>
+ <container style="h2">
+ <label text="${uiLabelMap.AccountingTimePeriod}: ${customTimePeriod.periodName}: ${customTimePeriod.fromDate} - ${customTimePeriod.thruDate}"/>
+ </container>
<container style="h3">
<label text="${uiLabelMap.AccountingConsolidatedDataFromDivisions}"/>
</container>
- <include-form name="TrialBalanceFinancialTimePeriodSelection" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<include-grid name="TrialBalanceReport" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container style="h3">
<label text="${uiLabelMap.AccountingDebitFlag}: ${postedDebitsTotal}"/>
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 2a3f4e14fc..cacb4f54f2 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -30,7 +30,7 @@ under the License.
<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="" tabindex="" disabled="" isXMLHttpRequest=""><@renderField value /></#macro>
-<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex disabled>
+<#macro renderDropDownField name className alert id formName action explicitDescription options fieldName otherFieldName otherValue otherFieldSize ajaxEnabled ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup="" tabindex="" multiple="" event="" size="" firstInList="" currentValue="" allowEmpty="" dDFCurrent="" noCurrentSelectedKey="" disabled=false>
<#if currentValue?has_content && firstInList?has_content>
<@renderField explicitDescription />
<#else>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index cef7103d58..6bb5ba4e52 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -57,7 +57,7 @@ under the License.
<#macro renderDateTimeField name className alert title value size maxlength step timeValues id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="" tabindex="" disabled="" isXMLHttpRequest=""><@makeBlock className value /></#macro>
-<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex firstInList="" currentValue="" disabled="">
+<#macro renderDropDownField name className alert id formName action explicitDescription options fieldName otherFieldName otherValue otherFieldSize ajaxEnabled ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup="" tabindex="" multiple="" event="" size="" firstInList="" currentValue="" allowEmpty="" dDFCurrent="" noCurrentSelectedKey="" disabled=false>
<#if currentValue?has_content && firstInList?has_content>
<@makeBlock "" explicitDescription />
<#else>