Merge branch 'riri' into 'master'

Riri

See merge request !1408

src/container/MonthlyReport/ProfitLossMR.js

@@ -851,8 +851,14 @@ export default class ProfitLossMR extends Component {
                 }
             })
 
-            dataTable2[tableMeta.rowIndex][11] = Number(total).toFixed(1)
-            return total
+            if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") {
+                let value = Number(dataTable2[tableMeta.rowIndex - 2][11]) / Number(dataTable2[tableMeta.rowIndex - 1][11])
+                dataTable2[tableMeta.rowIndex][11] = R.equals(value, NaN) ? "0.0" :  (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
+                return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
+            } else {
+                dataTable2[tableMeta.rowIndex][11] = Number(total).toFixed(1)
+                return total
+            }
         }
 
         let columns = [