Merge branch 'rifka' into 'master'

db tp

See merge request !806

src/container/MonthlyReport/TaxPlanningMR.js

@@ -117,7 +117,7 @@ export default class TaxPlanningMR extends Component {
         }
         api.create().getHierarkiMontlyReportTP(payload).then(response => {
             console.log(response);
-            // console.log(payload);
+            console.log(payload);
             let dataTable = []
             if (response.data) {
                 if (response.data.status == 'success') {
@@ -289,9 +289,9 @@ export default class TaxPlanningMR extends Component {
                             order: i[0] === undefined ? "" : String(i[0]).trim(),
                             item_report_id: i[1] === undefined ? "" : String(i[1]).trim(),
                             item_report_name: i[2] === undefined ? "" : String(i[2]).trim(),
-                            trial_balance_commercial: "",
-                            fiscal_correction: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[3]).trim()).toFixed(2)) :String(Number(String(i[3]).trim()).toFixed(1)),
-                            trial_balance_fiscal: "",
+                            trial_balance_commercial: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[3]).trim()).toFixed(2)) :String(Number(String(i[3]).trim()).toFixed(1)),
+                            fiscal_correction: i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[4]).trim()).toFixed(2)) :String(Number(String(i[4]).trim()).toFixed(1)),
+                            trial_balance_fiscal: i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[5]).trim()).toFixed(2)) :String(Number(String(i[5]).trim()).toFixed(1)),
                             trial_balance_fiscal_actual: "",
                             trial_balance_fiscal_mb: "",
                         })