Commit cba56b9c authored by rifkaki's avatar rifkaki

conflict index

parents 659fdcd1 3f56b6b7
......@@ -245,6 +245,7 @@ const create = (type = "") => {
const getHierarkiCreateReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
const createReportPLMB = (body) => api.post('/transaction/db_profit_loss/master_budget/create_submission_report', body)
const createReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/create_monthly_report', body)
const getPLID = (body) => api.post('/transaction/db_profit_loss/get_profit_loss_id', body)
// const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
// const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
const getReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
......@@ -635,6 +636,7 @@ const create = (type = "") => {
getHierarkiCreateReportPLMR,
createReportPLMB,
createReportPLMR,
getPLID,
getHierarkiReportHistorical
}
}
......
This diff is collapsed.
......@@ -141,7 +141,7 @@ export default class TableSummaryTriputra extends Component {
<div className="col-1">
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'right', width: 60 }}>
{val.a}
</div>
</div>
......@@ -158,7 +158,7 @@ export default class TableSummaryTriputra extends Component {
</div>
</div>
<div className="col-2">
<div className="grid grid-3x content-center">
<div className="grid grid-3x content-center">
<div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}>
{val.d}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment