Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into GGMAC

src/container/OutlookPA.js

@@ -310,7 +310,7 @@ export default class OutlookPA extends Component {
                     let data = []
                     response.data.data.map((item) => {
                         if (this.state.isApprover) {
-                            if (item >= 2000 && item <= (Number(currentYear) + 1)) {
+                            if (item >= 2000 && item <= (Number(currentYear) + 10)) {
                                 data.push(item)
                             }
                         } else {
@@ -328,7 +328,7 @@ export default class OutlookPA extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
+                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 10) : this.state.lastPeriod)
                     let index = data.sort((a, b) => a - b).findIndex((val) => val === periode)
                     // console.log(data)
                     // console.log(this.state.lastPeriod)

src/container/RollingOutlook/BalanceSheetRO.js

@@ -728,7 +728,7 @@ export default class BalanceSheetRO extends Component {
             name: "Account",
             options: {
                 customHeadRender: (columnMeta) => (
-                    <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300 }}>
+                    <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300, borderRight: '1px #fff solid' }}>
                         <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
                     </TableCell>
                 ),