Калуга убрана из брака

diff --git a/erp24/records/MotivationCostsItem.php b/erp24/records/MotivationCostsItem.php
index 9492f9c6e2c01a28419d9205a76c5a20f2e120b6..1f9de0bee65e93b06f5d8d14dfbb8cdfe54c111d 100644 (file)
--- a/erp24/records/MotivationCostsItem.php
+++ b/erp24/records/MotivationCostsItem.php
@@ -35,7 +35,7 @@ class MotivationCostsItem extends ActiveRecord
             case WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK: return self::ITEM_DEFECTIVE_DELIVERY;
             case WriteOffsErp::WRITE_OFFS_TYPE_DUE_TO_EQUIPMENT_FAILURE_BRAK: return self::ITEM_DEFECT_DUE_TO_EQUIPMENT_FAILURE;
             case WriteOffsErp::WRITE_OFFS_TYPE_RESORTING_DOES_NOT_COUNT_TOWARDS_COST: return self::ITEM_REGRADING;
-            default: return self::ITEM_WRITE_OFF_OF_ILLIQUID_GOODS_SPOILAGE_EXPIRATION_OF_SHELF_LIFE;
+            default: return '';
         }
     }
 

diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index f94585cc59c8ba6e86eba60113d8d0ae46c2244f..6e2371b322fba415abcc72a603d6d3ada002d02c 100644 (file)
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -356,6 +356,9 @@ class MotivationService
 
                 foreach ($writeOffs as $key => $data) {
                     $motivationItemType = MotivationCostsItem::writeOffsToMotivationItemMap($key);
+                    if (empty($motivationItemType)) {
+                        continue;
+                    }
                     $motivationCostsItem = MotivationCostsItem::find()->where(['name' => $motivationItemType])->one();
                     /** @var $motivationCostsItem MotivationCostsItem */
                     if ($motivation) {