Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _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 );
    }
  *]
}