Merge branch 'didam' into 'master'

Didam

See merge request !1565

src/container/MonthlyReport/TaxPlanningMR.js

@@ -11,6 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
 import Constant from '../../library/Constant';
+import { roundMath } from '../../library/Utils';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -360,9 +361,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: 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_commercial: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[3]).trim()),2)) :String(roundMath(Number(String(i[3]).trim()),1)),
+                            fiscal_correction: i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[4]).trim()),2)) :String(roundMath(Number(String(i[4]).trim()),1)),
+                            trial_balance_fiscal: i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[5]).trim()),2)) :String(roundMath(Number(String(i[5]).trim()),1)),
                             trial_balance_fiscal_actual: "",
                             trial_balance_fiscal_mb: "",
                         })