Merge branch 'rifka' into 'master'

Rifka

See merge request !733

src/container/MonthlyReport/TaxPlanningMR.js

@@ -94,7 +94,7 @@ export default class TaxPlanningMR extends Component {
             "months": this.props.month.month_id
         }
         api.create().getHierarkiMontlyReportTP(payload).then(response => {
-            console.log(response);
+            // console.log(response);
             console.log(payload);
             let dataTable = []
             if (response.data) {
@@ -501,8 +501,8 @@ export default class TaxPlanningMR extends Component {
     async downloadAllData() {
         let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         let urls = `https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
-        // console.log(urls);
-        console.log(url);
+        // console.log(url);
+        console.log(urls);
         let res = await fetch(
             this.props.monthlyReportId == null ? url : urls
         )
@@ -926,13 +926,12 @@ export default class TaxPlanningMR extends Component {
                 ),
                 setCellProps: () => ({ style2 }),
                 customBodyRender: (value, tableMeta, updateValue) => {
-                    console.log(value)
                     return (
                         <div>
                             <div className="grid grid-3x content-center">
                                 <div className="col-1">
                                     <div style={{ textAlign: 'right', width: 90 }}>
-                                        {tableMeta.rowData[1] === 4 || tableMeta.rowData[1] ?
+                                        {tableMeta.rowData[1] === 4 || tableMeta.rowData[1] === 1 ?
                                             null :
                                             tableMeta.rowData[1] === 2 ?
                                                 <span style={{ fontSize: 12, textAlign: 'right' }}>