Merge branch 'GGMAC' into 'master'

cat current_year_ttl

See merge request !1434

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -89,7 +89,7 @@ export default class CorporateAnnualTargetRO extends Component {
         let checkLastStatus = false
         let checkStatus = false
         let checkPrevRev = false
-
+        console.log('skuy');
         if (this.props.isApprover) {
             checkApprover = true
         } else {
@@ -114,7 +114,8 @@ export default class CorporateAnnualTargetRO extends Component {
             checkStatus = false
         }
 
-        this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
+        // this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
+        this.setState({viewOnly: true})
     }
 
     getItemHierarki() {
@@ -620,7 +621,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 "october": stateFR ? i[0] == 3 ? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
                 "november": stateFR ? i[0] == 3 ? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
                 "december": stateFR ? i[0] == 3 ? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
-                "total_current_year": String(Number(i[23]).toFixed(1)) == "" ? "0.0" : String(Number(i[23]).toFixed(1)),
+                "current_year_total": String(Number(i[23]).toFixed(1)) == "" ? "0.0" : String(Number(i[23]).toFixed(1)),
                 "strategic": String(i[24]),
                 "pic": String(i[25])
             })