Merge branch 'rifka' into 'master'

pl tp mr See merge request !748

Merge branch 'rifka' into 'master'
pl tp mr See merge request !748
7dfdce25 · Rifka Kurnia · e59b686a · 0f7ed65f · 7dfdce25 · 7dfdce25
Commit 7dfdce25 authored Dec 04, 2020 by Rifka Kurnia
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 78 additions and 77 deletions

ProfitLossMR.js src/container/MonthlyReport/ProfitLossMR.js +1 -1

TaxPlanningMR.js src/container/MonthlyReport/TaxPlanningMR.js +77 -76

No files found.
--- a/src/container/MonthlyReport/ProfitLossMR.js
+++ b/src/container/MonthlyReport/ProfitLossMR.js
@@ -680,7 +680,7 @@ export default class ProfitLossMR extends Component {
                    }
                }
            }, {
-                name: "Rolling Outlook (FY  2021)",
+                name: `Rolling Outlook (FY ${this.props.periode})`,
                options: {
                    customHeadRender: (columnMeta) => (
                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>

--- a/src/container/MonthlyReport/TaxPlanningMR.js
+++ b/src/container/MonthlyReport/TaxPlanningMR.js