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

diff --git a/erp24/records/Motivation.php b/erp24/records/Motivation.php
index 65112bcd341ce352b024ba0544773a8061f8dfe8..14fee7b8dcbd0a1e5367662a1a095b19c7d17e53 100644 (file)
--- 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 81313f7b322a71fc821459804e90821d19d10725..52e09d9c1debeed726e9a1a873bd6899ce567978 100644 (file)
--- 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 f81f4f6810c0c72bdac2ee0b2b2dd11b26fe3594..6eb1bc417fc35748ef14b3be0d17fec1fba91c4e 100644 (file)
--- 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);