X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=controllers%2FItemsController.php;h=9938bcf8b92b91fc3d4a8b07e0a0e02bc015277c;hb=fd27e17e57b1ad0f5cf535913af357a932a6a329;hp=dd0dbb7f3dc3c295ce3846cbc0462cae018357b5;hpb=cc1d4a4454905acc36282cd173f3312e122ff19b;p=invent%2Finvent.git

diff --git a/controllers/ItemsController.php b/controllers/ItemsController.php
index dd0dbb7..9938bcf 100644
--- a/controllers/ItemsController.php
+++ b/controllers/ItemsController.php
@@ -332,7 +332,7 @@ class ItemsController extends Controller
                         }
                         else
                         {
-                            $state = isset($row[ 'status' ]) ? StatusController::addIfNeed($row) : StatusController::addIfNeed([ 'name' => 'Склад' ]);
+                            $state = isset($row[ 'status' ]) ? StatusController::addIfNeed($row) : StatusController::addIfNeed([ 'status' => 'Склад' ]);
                             if ( $state[ 'id' ] === FALSE )
                             {
                                 // Сообщим об ошибке
@@ -487,12 +487,12 @@ class ItemsController extends Controller
                                 $flag = FALSE;
                                 foreach ($cellIterator as $key => $item)
                                 {
-                                    if (($key == 'A') && (stripos($item->getValue(), $columnsNames[ 'npp' ]) !== FALSE)) $flag = TRUE;
+                                    if (($key == 'A') && (stripos($item->getCalculatedValue(), $columnsNames[ 'npp' ]) !== FALSE)) $flag = TRUE;
                                     if ($flag)
                                     {
                                         foreach ($columnsNames as $name => $text)
                                         {
-                                            if (stripos($item->getValue(), $text) !== FALSE)
+                                            if (stripos($item->getCalculatedValue(), $text) !== FALSE)
                                             {
                                                 $columns[ $name ] = $key;
                                             }
@@ -508,14 +508,14 @@ class ItemsController extends Controller
                                 {
                                     if ($key == $columns[ 'npp' ])
                                     {
-                                        $npp = str_replace(' ', '', $item->getValue());
+                                        $npp = str_replace(' ', '', $item->getCalculatedValue());
                                         if (ctype_digit($npp)) $flag = TRUE;
                                     }
                                     if ($flag)
                                     {
                                         foreach($columns as $keym => $index)
                                         {
-                                            if ($index == $key) $line[ $keym ] = $item->getValue();
+                                            if ($index == $key) $line[ $keym ] = $item->getCalculatedValue();
                                         }
                                     }
                                 }