From a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 12:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
index 8fa3b08..592acd8 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
@@ -11,13 +11,10 @@
startofyear := startofplanning.StartOfYear();
startofnextyear := startofplanning.StartOfNextYear();
- for( start := startofyear; start < startofnextyear; start := start + Duration::Days( 1 ) ){
+ for( start := startofyear; start < startofnextyear; start := start.StartOfMonth() ){
periodtime := start.Date();
periodname := periodtime.Format( "M2/D2/Y" );
- this.FinancialSalesColumn( relnew, Name := periodname, Period := periodtime, IsDay := true );
- if( start = start.StartOfMonth() ){
- this.FinancialSalesColumn( relnew, Name := periodname, Period := periodtime );
- }
+ this.FinancialSalesColumn( relnew, Name := periodname, Period := periodtime );
}
*]
}
--
Gitblit v1.9.3