Merge branch 'rifka' into 'master'

baru get hierarki aja gan

See merge request !1271

src/api/index.js

@@ -245,7 +245,7 @@ const create = (type = "") => {
   const getRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/get_report_hierarki', body)
   const createRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/create_rolling_outlook', body)
   const getRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/get_report_hierarki', body)
-
+  const getRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/get_report_hierarki', body)
 
   //REPORT NEW
   const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
@@ -699,6 +699,7 @@ const create = (type = "") => {
     getRollingOutlookID,
     getRollingOutlookBS,
     createRollingOutlookBS,
+    getRollingOutlookTP,
     getAllMasterDataCat,
     getParentItemReport,
     saveMasterDataCat,

src/container/RollingOutlook.js

@@ -327,7 +327,7 @@ export default class RollingOutlook extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod))
+                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.latestPeriode))
                     // console.log(data)
                     console.log(this.state.lastPeriod)
                     // console.log(periodeData)
@@ -1241,6 +1241,7 @@ export default class RollingOutlook extends Component {
                         onClickClose={() => this.setState({ visibleTP: false, visibleRollingOutlook: true })}
                         status={this.state.status}
                         lastStatus={this.state.lastStatus}
+                        isApprover={'false'}
                     />
                 )}