Merge branch 'rifka' into 'master'

conflict bs too

See merge request !867

src/container/MonthlyReport/BalanceSheetMR.js

@@ -140,6 +140,7 @@ export default class BalanceSheetMR extends Component {
             "get_for" : this.state.get_for
         }
         api.create().getHierarkiMontlyReportBS(payload).then(response => {
+            console.log(payload);
             console.log(response);
             let dataTable = []
             let err = false
@@ -418,6 +419,7 @@ export default class BalanceSheetMR extends Component {
         }
         console.log(body);
         // console.log(JSON.stringify(body));
+        console.log(body)
         api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => {
             console.log(response);
             if (response.data) {
@@ -473,7 +475,7 @@ export default class BalanceSheetMR extends Component {
         }
         api.create('UPLOAD').createMonthlyReportBS(payload).then(response => {
             console.log(response);
-            console.log(JSON.stringify(payload))
+            // console.log(JSON.stringify(payload))
             if (response.data) {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()
@@ -493,7 +495,7 @@ export default class BalanceSheetMR extends Component {
         let err = false
         this.state.dataTable.map((i, index) => {
             if(i[0] === 3) {
-                console.log(i);
+                // console.log(i);
                 if ( i[17] === "" && (Number(i[12]) < this.state.minValue || Number(i[12]) > this.state.maxValue)) {
                     console.log('msk 1');
                     // console.log(i);
@@ -524,7 +526,7 @@ export default class BalanceSheetMR extends Component {
                 "mtd_vs_rb": i[19]
             })
         })
-        console.log(JSON.stringify(data));
+        // console.log(JSON.stringify(data));
         // data.map(i => {
         //     if (i.mtd_vs_previous_month === "" && (Number(i.percent_act_vs_previous_month) < this.state.minValue || Number(i.percent_act_vs_previous_month) > this.state.maxValue)) {
         //         console.log('msk 1');
@@ -556,7 +558,7 @@ export default class BalanceSheetMR extends Component {
             "months": this.props.month.month_id,
             "balance_sheet": data
         }
-        console.log(JSON.stringify(payload));
+        // console.log(JSON.stringify(payload));
         console.log(this.state.dataTable)
         api.create().validateSubmitReportBS(payload).then((response) => {
             console.log(response)