Merge branch 'GGMAC' into 'master'

Update CATMR

See merge request !1530

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -211,8 +211,8 @@ export default class CorporateAnnualTargetMR extends Component {
                         let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
                         if (indexIDzz === -1) {
                             let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
-                            let weight = String(item.weight).substr(0, String(item.weight).length - 1)
-                            let weightTB = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
+                            let weight = String(item.weight).includes('%')? String(item.weight).substr(0, String(item.weight).length - 1) : String(item.weight)
+                            let weightTB = String(item.corporate_annual_target.weight).includes('%')? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight)
                             // console.log(weight)
                             dataTable.push([
                                 item.type_report_id,