wzh 5 лет назад
Родитель
Сommit
d9bc60eaae

+ 2 - 2
api/application/controllers/Home.php

@@ -415,8 +415,8 @@ class Home extends Base_Controller {
             array('name'=>'Street light SN','field'=>'L.street_light_SN','fields1'=>'street_light_SN','enname'=>'Street light SN'),
             array('name'=>'Customer ID','field'=>'L.customer_ID','fields1'=>'customer_ID','enname'=>'Customer ID'),
             array('name'=>'Customer name','field'=>'L.customer_name','fields1'=>'customer_name','enname'=>'Customer name'),
-            array('name'=>'Fascal year','field'=>'L.fascal_year','fields1'=>'fascal_year','enname'=>'Fascal year'),
-            array('name'=>'Fascal year phase','field'=>'L.fascal_year_phase','fields1'=>'fascal_year_phase','enname'=>'Fascal year phase'),
+            array('name'=>'Fiscal year','field'=>'L.fascal_year','fields1'=>'fascal_year','enname'=>'Fiscal year'),
+            array('name'=>'Fiscal year phase','field'=>'L.fascal_year_phase','fields1'=>'fascal_year_phase','enname'=>'Fiscal year phase'),
             array('name'=>'PO name','field'=>'C1.name as po_name,C1.no as po_no','fields1'=>'po_name','enname'=>'PO name'),
             array('name'=>'Supplier name','field'=>'C2.name as supplier_name,C2.no as supplier_no','fields1'=>'supplier_name','enname'=>'Supplier name'),
             array('name'=>'MFRS name','field'=>'C3.name as MFRS_name,C3.no as MFRS_no','fields1'=>'MFRS_name','enname'=>'MFRS name'),

+ 2 - 2
api/application/helpers/function_helper.php

@@ -902,8 +902,8 @@ function get_fields_by_type($fileds,$type){
         'street_light_SN' => array('name'=>'Street light SN','enname'=>'Street light SN'),
         'customer_ID' => array('name'=>'Customer ID','enname'=>'Customer ID'),
         'customer_name' => array('name'=>'Customer name','enname'=>'Customer name'),
-        'fascal_year' => array('name'=>'Fascal year','enname'=>'Fascal year'),
-        'fascal_year_phase' => array('name'=>'Fascal year phase','enname'=>'Fascal year phase'),
+        'fascal_year' => array('name'=>'Fiscal year','enname'=>'Fiscal year'),
+        'fascal_year_phase' => array('name'=>'Fiscal year phase','enname'=>'Fiscal year phase'),
         'po_name' => array('name'=>'PO name','enname'=>'PO name'),
         'supplier_name' => array('name'=>'Supplier name','enname'=>'Supplier name'),
         'MFRS_name' => array('name'=>'MFRS name','enname'=>'MFRS name'),