From 248cdd6f07cb9599667bf5b0558e764125dccc2b Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 27 Aug 2024 12:06:57 +0300
Subject: [PATCH] =?utf8?q?ERP-85=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?utf8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BC=D0=B5=D0=BD?=
 =?utf8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=201=D0=A1=20?=
 =?utf8?q?=D0=91=D1=83=D1=85=D0=B3=D0=B0=D0=BB=D1=82=D0=B5=D1=80=D0=B8?=
 =?utf8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Motivation.php                                | 6 +++---
 erp24/scripts/tasks/task_32_create_request_for_1c_buh.php   | 2 +-
 ...sk_33_insert_data_to_monitvation_from_motivation_buh.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/erp24/records/Motivation.php b/erp24/records/Motivation.php
index 65112bcd..14fee7b8 100644
--- a/erp24/records/Motivation.php
+++ b/erp24/records/Motivation.php
@@ -67,11 +67,11 @@ class Motivation extends \yii\db\ActiveRecord
 
     public static function getWeekRangeForDate($date = null)
     {
-        $date = $date ?? date('Y-m-d');
+        $date = $date ?? strtotime(date('Y-m-d'));
 
         $day = date('d', $date);
         $month = date('m', $date);
-        $year = date('m', $date);
+        $year = date('Y', $date);
 
         $weekNumber = intdiv($day - 1, 7) + 1;
 
@@ -89,7 +89,7 @@ class Motivation extends \yii\db\ActiveRecord
 
     public static function getWeek($date = null)
     {
-        $date = $date ?? date('d');
+        $date = $date ?? date("d");
         $d = date("d", strtotime($date));
         return intval(floor(($d - 1) / 7) + 1);
 
diff --git a/erp24/scripts/tasks/task_32_create_request_for_1c_buh.php b/erp24/scripts/tasks/task_32_create_request_for_1c_buh.php
index 81313f7b..52e09d9c 100644
--- a/erp24/scripts/tasks/task_32_create_request_for_1c_buh.php
+++ b/erp24/scripts/tasks/task_32_create_request_for_1c_buh.php
@@ -30,7 +30,7 @@ $result = 0;
 
 $enable = true;
 $start = false;
-$force = false;
+$force = true;
 
 $minuetTimeInTask = date('i', $time);
 $fullTimeInTask = date('Y-m-d H:i:s', $time);
diff --git a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
index f81f4f68..6eb1bc41 100644
--- a/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
+++ b/erp24/scripts/tasks/task_33_insert_data_to_monitvation_from_motivation_buh.php
@@ -34,7 +34,7 @@ $result = 0;
 
 $enable = true;
 $start = false;
-$force = false;
+$force = true;
 
 $minuetTimeInTask = date('i', $time);
 $fullTimeInTask = date('Y-m-d H:i:s', $time);
-- 
2.39.5