Merge pull request #3720 from ColoredCow/release

Sync Master and Release Branch
ColoredCow · Oct 2, 2024 · 8e3504e · 8e3504e
2 parents 7f9adb8 + 1cdb70e
commit 8e3504e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Modules/EffortTracking/Services/EffortTrackingService.php b/Modules/EffortTracking/Services/EffortTrackingService.php
@@ -288,8 +288,8 @@ public function getEffortForProject($project, $syncParams = [])
                     $billingStartDate = Carbon::create($sheetUser[$sheetIndexForStartDate]);
                     $billingEndDate = Carbon::create($sheetUser[$sheetIndexForEndDate]);
                     if (array_key_exists('isBackDateSync', $syncParams) && $syncParams['isBackDateSync'] === 'on') {
-                        $monthlyBillingEndDate = $project->client->month_end_date;
-                        $currentDate = $monthlyBillingEndDate->subMonth();
+                        $monthlyBillingEndDate = $project->client->getMonthEndDateAttribute(1);
+                        $currentDate = $monthlyBillingEndDate;
                     } else {
                         $currentDate = now(config('constants.timezone.indian'))->today();
                     }