Merge branch 'rifka' into 'master'

conflict index

See merge request !1213

src/api/index.js

@@ -189,8 +189,7 @@ const create = (type = "") => {
   const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
   const getParentItemReport = (body) => api.post('item_report/get_parent_item_report_default', body)
   const saveMasterDataCat = (body) => api.post('item_report_company/create_item_report_company', body)
-  // const getDetailMasterDataCat = (id) => api.get(`item_report_company/create_item_report_company/${id}`)
-  const deleteMasterDataCat = (idCompany, years) => api.post(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
+  const deleteMasterDataCat = (idCompany, years) => api.get(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
 
   //Transaction
   const getReportTypeBody = (body) => api.post('transaction/master_budget/get_all_report', body)

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -610,7 +610,7 @@ export default class MasterDataCAT extends Component {
                                 item.weight, 
                                 item.years,
                                 item.status,
-                                item.item_report_company_id
+                                item.company_id
                             ]
                         })
                         this.setState({ dataTable: listData, listData: response.data.data }, () => {