Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-frontend into dev-wahyun

src/views/Master/MasterTransaction/DialogForm.js

@@ -165,7 +165,7 @@ class DialogForm extends Component {
         </FormGroup>
         <FormGroup>
           <Label className="capitalize" style={{ fontWeight: "bold" }}>
-            End Date<span style={{ color: "red" }}>*</span>
+          Expired Date<span style={{ color: "red" }}>*</span>
           </Label>
           {/* <DatePicker
             // disabledDate={(current) => {

src/views/Master/MasterTransaction/index.js

@@ -58,6 +58,7 @@ class index extends Component {
       }
     };
 
+    
     this.columns = [
       {
         title: this.props.t('action'),