Merge branch 'riri' into 'master'

issue prod

See merge request !1144

src/container/MonthlyReport/ProfitLossMR.js

@@ -706,7 +706,7 @@ export default class ProfitLossMR extends Component {
         const handleValue = (value, data) => {
             let total = 0
             dataTable2.map((item, index) => {
-                if (data.rowData[1] == item[2]) {
+                if (data.rowData[1] == item[2] && item[0] != 4) {
                     total = item[10] == undefined ? (Number(total) + 0) : (Number(total) + Number(String(item[10]).includes('-') ? Number(String(item[10]).substr(1, String(item[10]).length)) * -1 : Number(item[10])))
                 }
             })