Merge branch 'rifka' into 'master'

blank tp bs pl detail, notes pl detail See merge request !1062

Merge branch 'rifka' into 'master'
blank tp bs pl detail, notes pl detail See merge request !1062
6ed80e3d · Rifka Kurnia · 7fcfb4d7 · 23d2ede5 · 6ed80e3d · 6ed80e3d
Commit 6ed80e3d authored Jan 28, 2021 by Rifka Kurnia
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 160 additions and 71 deletions

SubHolding.js src/container/Laporan/SubHolding.js +5 -3

TableSubHolding.js src/container/Laporan/TableSubHolding.js +155 -68

No files found.
--- a/src/container/Laporan/SubHolding.js
+++ b/src/container/Laporan/SubHolding.js
@@ -398,7 +398,8 @@ export default class SubHolding extends Component {
                                item.profit_loss.monthly_last_year_september,
                                item.profit_loss.monthly_last_year_october,
                                item.profit_loss.monthly_last_year_november,
-                                item.profit_loss.monthly_last_year_december
+                                item.profit_loss.monthly_last_year_december,
+                                item.profit_loss.notes
                            ])
                        }
                        if (item.children !== null) {
@@ -457,7 +458,8 @@ export default class SubHolding extends Component {
                            item.profit_loss.monthly_last_year_september,
                            item.profit_loss.monthly_last_year_october,
                            item.profit_loss.monthly_last_year_november,
-                            item.profit_loss.monthly_last_year_december
+                            item.profit_loss.monthly_last_year_december,
+                            item.profit_loss.notes
                        ])
                        if (item.children !== null) {
                            if (item.children.length > 0) {
@@ -611,7 +613,7 @@ export default class SubHolding extends Component {
                    })
                    this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
                    // this.setState({ dataTable }, () => {
-                    //     console.log(this.state.dataTable)
+                        // console.log(this.state.dataTable)
                    //     this.getBalanceSheetMR(payload)
                    // })
                } else {

--- a/src/container/Laporan/TableSubHolding.js
+++ b/src/container/Laporan/TableSubHolding.js