Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1266

src/container/MonthlyReport/CashFlowMR.js

@@ -76,11 +76,13 @@ export default class CashFlowMR extends Component {
             checkPrevRev = false
         }
 
-        if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'drat' || this.props.status === 'submitted') {
+        if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
             checkStatus = true
         } else {
             checkStatus = false
         }
+        // console.log(this.props.status)
+        // console.log(this.props.lastStatus)
         // console.log(checkStatus)
         // console.log(checkLastStatus)
         // console.log(checkApprover)

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -684,7 +684,7 @@ export default class CorporateAnnualTargetMR extends Component {
                         }
                     } else if (target == 0) {
                         if (target >= actual) {
-                            totalAch = 1.25
+                            totalAch = 1.26
                         } else {
                             totalAch = 0
                         }
@@ -711,7 +711,7 @@ export default class CorporateAnnualTargetMR extends Component {
                         }
                     } else if (target == 0) {
                         if (target <= actual) {
-                            totalAch = 1.25
+                            totalAch = 1.26
                         } else {
                             totalAch = 0
                         }
@@ -1281,7 +1281,7 @@ export default class CorporateAnnualTargetMR extends Component {
                     }
                 } else if (target == 0) {
                     if (target >= actual) {
-                        total = 1.25
+                        total = 1.26
                     } else {
                         total = 0
                     }
@@ -1303,7 +1303,7 @@ export default class CorporateAnnualTargetMR extends Component {
                     }
                 } else if (target == 0) {
                     if (target <= actual) {
-                        total = 1.25
+                        total = 1.26
                     } else {
                         total = 0
                     }