Merge branch 'riri' into 'master'

Riri

See merge request !152

src/container/BudgetTahunan.js

@@ -3,6 +3,7 @@ import { Typography, Paper, TextField, MenuItem } from '@material-ui/core';
 import MUIDataTable from 'mui-datatables';
 import Images from '../assets/Images';
 import BalanceSheet from './BudgetTahunan/BalanceSheet';
+import ProfitLoss from './BudgetTahunan/ProfitLoss';
 
 export default class BudgetTahunan extends Component {
     constructor(props) {
@@ -12,7 +13,8 @@ export default class BudgetTahunan extends Component {
             perusahaan: 'TAP Group',
             revisi: '0',
             visibleBudgetTahunan: true,
-            visibleBS: false
+            visibleBS: false,
+            visiblePL: false
         }
     }
 
@@ -26,6 +28,15 @@ export default class BudgetTahunan extends Component {
                 visibleFAM: false,
                 visibleTP: false
             })
+        } else if (item === 'Profit & Loss') {
+            this.setState({
+                visibleBudgetTahunan: false, 
+                visibleBS: false,
+                visiblePL: true,
+                visibleCAT: false,
+                visibleFAM: false,
+                visibleTP: false
+            })
         }
     }
 
@@ -217,6 +228,9 @@ export default class BudgetTahunan extends Component {
                 {this.state.visibleBS && (
                     <BalanceSheet />
                 )}
+                {this.state.visiblePL && (
+                    <ProfitLoss />
+                )}
             </div >
         );
     }

src/container/MasterData/formReportItems/VisualReportItems.js

@@ -198,7 +198,7 @@ export default class VisualReportItems extends Component {
         return (
             <div>
                 <button type="button" onClick={() => this.collapse(item.id)}>{collapseIcon ? (this.state.arrayCollapse.includes(item.id) ? <AddIcon /> : <RemoveIcon />) : null}</button>
-                <label style={{ marginLeft: collapseIcon ? 10 : 0 }}>{item.report_name}</label>
+                <label style={{ marginLeft: collapseIcon ? 10 : 0 }}>{item.description}</label>
             </div>
         )
     };