Merge branch 'riri' into 'master'

update profit loss

See merge request !186

src/container/BudgetTahunan.js

@@ -317,7 +317,12 @@ export default class BudgetTahunan extends Component {
                     />
                 )}
                 {this.state.visiblePL && (
-                    <ProfitLoss />
+                    <ProfitLoss 
+                        report_id={this.state.report_id}
+                        company={this.state.company}
+                        onClickClose={()=> this.setState({ visiblePL: false, visibleBudgetTahunan: true})}
+                    />
+                    
                 )}
                 {this.state.visibleTP && (
                     <TaxPlanning 

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -350,7 +350,7 @@ export default class CreateReportItems extends Component {
                     <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
-                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Add Data</span>
+                                <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>
                             </div>
                         </div>
                         <div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
@@ -431,7 +431,7 @@ export default class CreateReportItems extends Component {
                                     debug
                                     renderInput={(params) =>
                                         <TextField {...params}
-                                            label="Company"
+                                            label="Company Name"
                                             InputLabelProps={{
                                                 style: {
                                                     fontSize: 11,
@@ -830,16 +830,14 @@ export default class CreateReportItems extends Component {
                         </div>
                     </div>
 
-                    <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingBottom: 20, paddingLeft: 20, paddingRight: 20 }}>
-                        <div className="column-1">
-                            <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5 }}>
-                                <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11 }}>Created By :</Typography>
-                                </div>
-                                <div style={{ display: 'flex' }}>
-                                    <Typography style={{ fontSize: 11 }}>Updated By :</Typography>
-                                </div>
-                            </div>
+                    <div className="margin-top-10px" style={{ padding: 20}}>
+                        <div style={{ display: 'flex' }}>
+                            <Typography style={{ fontSize: 11, width: '13%' }}>Created By</Typography>
+                            <Typography style={{ fontSize: 11 }}>: </Typography>
+                        </div>
+                        <div style={{ display: 'flex' }}>
+                            <Typography style={{ fontSize: 11, width: '13%' }}>Updated By</Typography>
+                            <Typography style={{ fontSize: 11 }}>: </Typography>
                         </div>
                     </div>
 

src/container/MasterData/formReportItems/EditReportItems.js

@@ -421,7 +421,7 @@ export default class EditReportItems extends Component {
                                     debug
                                     renderInput={(params) =>
                                         <TextField {...params}
-                                            label="Company"
+                                            label="Company Name"
                                             InputLabelProps={{
                                                 style: {
                                                     fontSize: 11,
@@ -789,11 +789,11 @@ export default class EditReportItems extends Component {
                     <div className="margin-top-10px" style={{ padding: 20}}>
                         <div style={{ display: 'flex' }}>
                             <Typography style={{ fontSize: 11, width: '13%' }}>Created By</Typography>
-                            <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.created}</Typography>
+                            <Typography style={{ fontSize: 11 }}>:  {this.state.tempData === null ? "" : this.state.tempData.created}</Typography>
                         </div>
                         <div style={{ display: 'flex' }}>
                             <Typography style={{ fontSize: 11, width: '13%' }}>Updated By</Typography>
-                            <Typography style={{ fontSize: 11 }}>: {this.state.tempData === null ? "" : this.state.tempData.updated}</Typography>
+                            <Typography style={{ fontSize: 11 }}>:  {this.state.tempData === null ? "" : this.state.tempData.updated}</Typography>
                         </div>
                     </div>