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