Merge branch 'master' into 'rifka'

# Conflicts:
#   src/api/index.js

src/api/index.js

@@ -264,7 +264,7 @@ const create = (type = "") => {
   const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body)
   const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`)
   const createTaxPlanningMR = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
-
+  const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/get_report_hierarki', body)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -466,7 +466,8 @@ const create = (type = "") => {
     getMonthlyReportID,
     getReportHierarkiFR,
     getDetailHierarkiCF,
-    getHierarkiMontlyReportPL
+    getHierarkiMontlyReportPL,
+    getHierarkiMontlyReportFAM
   }
 }