Merge branch 'deni-dev(pc)' into 'master'

otw mr sumo See merge request !561

Merge branch 'deni-dev(pc)' into 'master'
otw mr sumo See merge request !561
5b08a77e · Deni Rinaldi · 0ff6fc8b · 72787d9e · 5b08a77e · 5b08a77e
Commit 5b08a77e authored Oct 20, 2020 by Deni Rinaldi
Show whitespace changes
Inline Side-by-side

Showing with 954 additions and 2674 deletions

SubHolding.js src/container/Laporan/SubHolding.js +0 -2

TableSubHolding.js src/container/Laporan/TableSubHolding.js +954 -2672

No files found.
--- a/src/container/Laporan/SubHolding.js
+++ b/src/container/Laporan/SubHolding.js
@@ -291,7 +291,6 @@ export default class SubHolding extends Component {
                                item.formula,
                                item.level,
                                item.description,
-                                item.profit_loss.notes === "" ? null : item.profit_loss.notes,
                                item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
                                item.profit_loss.january,
                                item.profit_loss.february,
@@ -327,7 +326,6 @@ export default class SubHolding extends Component {
                            item.formula,
                            item.level,
                            item.description,
-                            item.profit_loss.notes === "" ? null : item.profit_loss.notes,
                            item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
                            item.profit_loss.january,
                            item.profit_loss.february,

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