Merge branch 'sprint216_zg_bug' into 'master'

* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527

module/execution/js/cfd.js

@@ -7,7 +7,8 @@ $(function()
     var colors     = ['#33B4DB', '#7ECF69', '#FFC73A', '#FF5A61', '#50C8D0', '#AF5AFF', '#4EA3FF', '#FF8C5A', '#6C73FF'];
     //var background = ['#E1F4FA', '#ECF8E9', '#FFF7E2', '#FFE7E8', '#E5F7F8', '#F3E7FF', '#E5F1FF', '#FFEEE7', '#E9EAFF'];
 
-    if(Object.keys(chartData).length)
+    var chartDom = document.getElementById('cfdChart');
+    if(Object.keys(chartData).length && chartDom)
     {
         $.each(chartData['line'], function(label, set)
         {
@@ -35,8 +36,7 @@ $(function()
             i ++;
         })
 
-        var chartDom = document.getElementById('cfdChart');
-        var CFD      = echarts.init(chartDom);
+        var CFD = echarts.init(chartDom);
         var option;
 
         option = {

module/execution/view/cfd.html.php

@@ -32,7 +32,7 @@
     $weekend = $withWeekend == 'true' ? 'noweekend' : 'withweekend';
     echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
     ?>
-    <div class='input-control w-100px'>
+    <div class='input-control w-140px'>
       <?php echo html::select('type', $lang->execution->cfdTypeList, $type, "class='form-control chosen'");?>
     </div>
     <div id="cfdDateSelect">

module/product/control.php

@@ -1445,6 +1445,7 @@ class product extends control
                 unset($fields[$key]);
             }
 
+            $lastProgram = $lastLine = '';
             $lines = $this->product->getLinePairs();
             $productStats = $this->product->getStats('program_desc,line_desc,' . $orderBy, null, $status);
             foreach($productStats as $i => $product)