From: marina <m.zozirova@gmail.com>
Date: Tue, 27 Aug 2024 09:06:57 +0000 (+0300)
Subject: ERP-85 Реализовать обмен данных с 1С Бухгалтерия
X-Git-Tag: 1.4~22^2~8
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=248cdd6f07cb9599667bf5b0558e764125dccc2b;p=erp24_rep%2Fyii-erp24%2F.git

ERP-85 Реализовать обмен данных с 1С Бухгалтерия
---

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);