diff --git a/www/app/entity/doc/task.php b/www/app/entity/doc/task.php
index 5e49ab11d..2236fd106 100644
--- a/www/app/entity/doc/task.php
+++ b/www/app/entity/doc/task.php
@@ -20,7 +20,8 @@ public function generateReport() {
         $detail = array();
 
         foreach ($this->unpackDetails('detaildata') as $ser) {
-
+            if($ser->cost=="") $ser->cost=0;
+            if($ser->hours=="") $ser->hours=0;
             $detail[] = array("no"           => $i++,
                               "service_name" => $ser->service_name,
                               "cost"         => H::fa($ser->cost * $ser->qty),
diff --git a/www/app/pages/reference/itemlist.php b/www/app/pages/reference/itemlist.php
index cf5401bbb..e312dc549 100644
--- a/www/app/pages/reference/itemlist.php
+++ b/www/app/pages/reference/itemlist.php
@@ -281,6 +281,10 @@ public function OnSubmit($sender) {
         }
 
         $this->_item->itemname = $this->itemdetail->editname->getText();
+        if(strlen($this->_item->itemname)==0) {
+            $this->setError('entername');
+            return;
+        }
         $this->_item->shortname = $this->itemdetail->editshortname->getText();
         $this->_item->cat_id = $this->itemdetail->editcat->getValue();
         $this->_item->price1 = $this->itemdetail->editprice1->getText();
diff --git a/www/app/pages/reference/mflist.php b/www/app/pages/reference/mflist.php
index 35b4ffd1d..ab0bc61e4 100644
--- a/www/app/pages/reference/mflist.php
+++ b/www/app/pages/reference/mflist.php
@@ -40,7 +40,7 @@ public function __construct() {
         $this->mfdetail->add(new TextInput('editmf_name'));
         $this->mfdetail->add(new DropDownChoice('editbranch', $this->_blist, 0));
 
-        $this->mfdetail->add(new CheckBox('editbeznal'));
+        $this->mfdetail->add(new CheckBox('editbeznal'))->onChange($this,'onBeznal');
         $this->mfdetail->add(new TextInput('editbtran'));
         $this->mfdetail->add(new TextArea('editmf_description'));
         $this->mfdetail->add(new TextInput('editbank'));
@@ -86,7 +86,7 @@ public function editOnClick($sender) {
         $this->mfdetail->editmf_name->setText($this->_mf->mf_name);
         $this->mfdetail->editbranch->setValue($this->_mf->branch_id);
         $this->mfdetail->editbeznal->setChecked($this->_mf->beznal);
-
+        $this->onBeznal($this->mfdetail->editbeznal);
         $this->mfdetail->editmf_description->setText($this->_mf->mf_description);
         $this->mfdetail->editbank->setText($this->_mf->bank);
         $this->mfdetail->editbankacc->setText($this->_mf->bankacc);
@@ -109,6 +109,10 @@ public function saveOnClick($sender) {
         }
 
         $this->_mf->mf_name = $this->mfdetail->editmf_name->getText();
+        if(strlen($this->_mf->mf_name)==0) {
+            $this->setError('entername');
+            return;
+        }        
         $this->_mf->btran = $this->mfdetail->editbtran->getText();
         $this->_mf->bank = $this->mfdetail->editbank->getText();
         $this->_mf->bankacc = $this->mfdetail->editbankacc->getText();
@@ -135,5 +139,12 @@ public function cancelOnClick($sender) {
         $this->mftable->setVisible(true);
         $this->mfdetail->setVisible(false);
     }
+    
+    public function onBeznal($sender) {
+         $b = $sender->isChecked();         
+         $this->mfdetail->editbank->setVisible($b);
+         $this->mfdetail->editbankacc->setVisible($b);
+         $this->mfdetail->editbtran->setVisible($b);
+    }
 
 }
diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html
index e63e643a3..d96b55124 100644
--- a/www/templates/pages/reference/itemlist.html
+++ b/www/templates/pages/reference/itemlist.html
@@ -109,7 +109,7 @@ <h4>Редактирование товара </h4>
             <div class="form-group row">
                 <label class="col-5 col-form-label" for="editname">Наименование</label>
                 <div class="col-7">
-                    <input required="required" class="form-control" zippy="editname"/>
+                    <input   class="form-control" zippy="editname"/>
                 </div>
             </div>
             <div class="form-group row">
diff --git a/www/templates/pages/reference/mflist.html b/www/templates/pages/reference/mflist.html
index 7a8a4dfcc..d108f3b70 100644
--- a/www/templates/pages/reference/mflist.html
+++ b/www/templates/pages/reference/mflist.html
@@ -47,7 +47,7 @@ <h3>Кассы и банковские  счета</h3>
         <form zippy="mfdetail">
             <div class="form-group">
                 <label for="editmf_name">Название</label>
-                <input required="required" class="form-control" zippy="editmf_name"/>
+                <input   class="form-control" zippy="editmf_name"/>
             </div>
             <div class="form-check">
               <input zippy="editbeznal" type="checkbox" class="form-check-input">
@@ -55,15 +55,15 @@ <h3>Кассы и банковские  счета</h3>
             
             </div> 
                                <div class="form-group">
-            <label for="editbank">Банк, МФО </label>
+            <label for="editbank" data-label="editbank">Банк, МФО </label>
             <input class="form-control" type="text" zippy="editbank">
             </div>
             <div class="form-group">
-                <label for="editbankacc">Расчетный счет </label>
+                <label for="editbankacc" data-label="editbankacc">Расчетный счет </label>
                 <input class="form-control" type="text" zippy="editbankacc">
             </div>
              <div class="form-group">
-                <label for="editbtran">Процент банка</label>
+                <label for="editbtran" data-label="editbtran">Процент банка</label>
                 <input style="width:100px" pattern="[0-9\.]+"   class="form-control" zippy="editbtran"/>
                 <small>Процент, который  банк  берет  за  перевод  суммы. Учитывается  как  общепроизводственные  расходы</small>
             </div>
diff --git a/www/templates_ua/pages/reference/itemlist.html b/www/templates_ua/pages/reference/itemlist.html
index 0ace6ca88..3cec193c2 100644
--- a/www/templates_ua/pages/reference/itemlist.html
+++ b/www/templates_ua/pages/reference/itemlist.html
@@ -109,7 +109,7 @@ <h4>Редагування товару </h4>
             <div class="form-group row">
                 <label class="col-5 col-form-label" for="editname">Найменування</label>
                 <div class="col-7">
-                    <input required="required" class="form-control" zippy="editname"/>
+                    <input   class="form-control" zippy="editname"/>
                 </div>
             </div>
             <div class="form-group row">
diff --git a/www/templates_ua/pages/reference/mflist.html b/www/templates_ua/pages/reference/mflist.html
index bd664d67d..6a5133a24 100644
--- a/www/templates_ua/pages/reference/mflist.html
+++ b/www/templates_ua/pages/reference/mflist.html
@@ -47,7 +47,7 @@ <h3>Каси та  банкiвскi рахунки</h3>
         <form zippy="mfdetail">
             <div class="form-group">
                 <label for="editmf_name">Назва</label>
-                <input required="required" class="form-control" zippy="editmf_name"/>
+                <input   class="form-control" zippy="editmf_name"/>
             </div>
             <div class="form-check">
               <input zippy="editbeznal" type="checkbox" class="form-check-input">
@@ -55,15 +55,15 @@ <h3>Каси та  банкiвскi рахунки</h3>
             
             </div> 
                                <div class="form-group">
-            <label for="editbank">Банк, МФО </label>
+            <label for="editbank" data-label="editbank">Банк, МФО </label>
             <input class="form-control" type="text" zippy="editbank">
         </div>
         <div class="form-group">
-            <label for="editbankacc">Розрахунковий рахунок</label>
+            <label for="editbankacc" data-label="editbankacc">Розрахунковий рахунок</label>
             <input class="form-control" type="text" zippy="editbankacc">
         </div>
               <div class="form-group">
-                <label for="editbtran">Процент банку</label>
+                <label for="editbtran" data-label="editbtran">Процент банку</label>
                 <input style="width:100px" pattern="[0-9\.]+"   class="form-control" zippy="editbtran"/>
                 <small>Процент, який  банк  бере  за  перевод  суммы. </small>
             </div>