SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAYROLL AMEND DATE FORMAT

Browse Source
This commit is contained in:
velz2020 2017-08-12 19:09:48 +05:30
parent fe87b68305
commit d7784099c8
8 changed files with 176 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/amendmentpurchaseorder.php
View File

@ -332,7 +332,7 @@ class amendmentpurchaseorder extends BaseController
}
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'AmendedDetails'=>$MAD);
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
//print_r($POMaster);
@ -891,7 +891,8 @@ function UpdateAmendServicePurchaseOrder()
if($PaymentMethod != 'PT08'){
$Otherpayment='';
}
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$FinalTotalOrder,'POType'=>$POType,'PODate'=>$PODate,'Status'=>PO_RELEASED,'CapitalRange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'PaymentOtherDescription'=>$Otherpayment,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'AmendedDetails'=>$MAD,'Import_DispatchDetails'=>$curdispatch,'Import_PlaceofOrgin'=>$PlaceOforigin);
$updatedBy = $this->session->userdata ( 'userId' );
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$FinalTotalOrder,'POType'=>$POType,'PODate'=>$PODate,'Status'=>PO_RELEASED,'CapitalRange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'PaymentOtherDescription'=>$Otherpayment,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'AmendedDetails'=>$MAD,'Import_DispatchDetails'=>$curdispatch,'Import_PlaceofOrgin'=>$PlaceOforigin);
// print_r($POMaster);
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$CreateBy,$PONO);

26
application/controllers/emppaydate.php
View File

@ -86,7 +86,6 @@ class emppaydate extends BaseController
$this->load->library('form_validation');
$this->form_validation->set_rules('EmpID','EmpID','required');
$this->form_validation->set_rules('Basic_Pay','Basic_Pay','trim|required');
$this->form_validation->set_rules('HRA_Rate','HRA_Rate','trim|required');
$this->form_validation->set_rules('OT_Rate','OT_Rate','trim|required');
$this->form_validation->set_rules('Allowances','Allowances','trim|required');
@ -103,14 +102,16 @@ class emppaydate extends BaseController
{
$Pay_Data_ID=$this->input->post('Pay_Data_ID');
$EmpID = $this->input->post('EmpID');
$Total_Salary=$this->input->post('Total_salary');
$Basic_Pay=$this->input->post('Basic_Pay');
$HRA_Rate=$this->input->post('HRA_Rate');
$HRA_Amount=$this->input->post('HRA_Amount');
$OT_Rate=$this->input->post('OT_Rate');
$Allowances=$this->input->post('Allowances');
$PF_Rate=$this->input->post('PF_Rate');
$ESI_Rate=$this->input->post('ESI_Rate');
$Food_Allowances=$this->input->post('Food_Allowances');
//$All = $this->input->post('All');
//$All = $this->input->post('All');
$CreateBy = $this->session->userdata ( 'userId' );
$chked = $this->input->post('is_Active');
@ -131,13 +132,14 @@ class emppaydate extends BaseController
//$createddt = $dt->format('Y-m-d H:i:s');
// $emppayExists = $this->emppaydate_model->( $emppay);
$emppay = array();
// Becasue of done cool thinfg of it.
// $emppay = array();
$emppay = array('EmpID'=>$EmpID, 'Basic_Pay'=>$Basic_Pay, 'HRA_Rate'=>$HRA_Rate, 'OT_Rate'=>$OT_Rate, 'Allowances'=>$Allowances, 'PF_Rate'=>$PF_Rate, 'ESI_Rate'=>$ESI_Rate ,'Food_Allowances'=>$Food_Allowances,'is_Active'=>$IsActive,'Created_By'=>$CreateBy);
$emppay = array('EmpID'=>$EmpID,'TotalSalary'=>$Total_Salary,'Basic_Pay'=>$Basic_Pay,'HRA_Rate'=>$HRA_Rate,'HRA_Amount'=>$HRA_Amount, 'OT_Rate'=>$OT_Rate, 'Allowances'=>$Allowances, 'PF_Rate'=>$PF_Rate, 'ESI_Rate'=>$ESI_Rate ,'Food_Allowances'=>$Food_Allowances,'is_Active'=>$IsActive,'Created_By'=>$CreateBy);
//print_r($monthdata);
// print_r($emppay);die();
$result = $this->emppaydate_model->addNewemppay($emppay);
if($result > 0)
@ -188,6 +190,7 @@ class emppaydate extends BaseController
$this->form_validation->set_rules('Pay_Data_ID','Pay_Data_ID','trim|required');
$this->form_validation->set_rules('EmpID','EmpID','trim|required');
$this->form_validation->set_rules('total_salary','total_salary','trim|required');
$this->form_validation->set_rules('Basic_Pay','Basic_Pay','trim|required');
$this->form_validation->set_rules('HRA_Rate','HRA_Rate','trim|required');
$this->form_validation->set_rules('OT_Rate','OT_Rate','trim|required');
@ -211,8 +214,10 @@ class emppaydate extends BaseController
$Pay_Data_ID=$this->input->post('Pay_Data_ID');
$EmpID = $this->input->post('EmpID');
$Basic_Pay=$this->input->post('Basic_Pay');
$TotalSalary=$this->input->post('total_salary');
$Basic_Pay=$this->input->post('Basic_Pay');
$HRA_Rate=$this->input->post('HRA_Rate');
$HRA_Amount=$this->input->post('HRA_Amount');
$OT_Rate=$this->input->post('OT_Rate');
$Allowances=$this->input->post('Allowances');
$PF_Rate=$this->input->post('PF_Rate');
@ -237,7 +242,7 @@ class emppaydate extends BaseController
$emppaydatas = array();
$emppaydatas = array('Pay_Data_ID'=>$Pay_Data_ID, 'EmpID'=>$EmpID, 'Basic_Pay'=>$Basic_Pay, 'HRA_Rate'=>$HRA_Rate, 'OT_Rate'=>$OT_Rate, 'Allowances'=>$Allowances, 'PF_Rate'=>$PF_Rate, 'ESI_Rate'=>$ESI_Rate,'Food_Allowances'=>$Food_Allowances, 'Last_Mod_By'=>$Last_Mod_By, 'Last_Mod_Time'=>$Last_Mod_Time, 'is_Active'=>$IsActive);
$emppaydatas = array('Pay_Data_ID'=>$Pay_Data_ID, 'EmpID'=>$EmpID,'TotalSalary'=>$TotalSalary,'Basic_Pay'=>$Basic_Pay, 'HRA_Rate'=>$HRA_Rate,'HRA_Amount'=>$HRA_Amount,'OT_Rate'=>$OT_Rate, 'Allowances'=>$Allowances, 'PF_Rate'=>$PF_Rate, 'ESI_Rate'=>$ESI_Rate,'Food_Allowances'=>$Food_Allowances, 'Last_Mod_By'=>$Last_Mod_By, 'Last_Mod_Time'=>$Last_Mod_Time, 'is_Active'=>$IsActive);
@ -246,10 +251,13 @@ class emppaydate extends BaseController
if($result == true)
{
$this->session->set_flashdata('success', 'updated successfully');
echo "<script>alert('Employee Status Updated Sucessfully..!');</script>";
//$this->session->set_flashdata('success', 'updated successfully');
}
else
{
echo "<script>alert('Update Failed..!')</script>";
$this->session->set_flashdata('error', 'updation failed');
}

83
application/views/addemppaydate.php
View File

@ -74,12 +74,24 @@
</div>
<div class="col-md-4">
<div class="form-group">
<label for="Basic_Pay">Total Salary:</label><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="Basic_Pay">Basic Pay:</label><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number');
$data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number','readonly'=>'readonly');
echo form_input($data);
?>
</div>
@ -91,22 +103,38 @@
<div class="col-md-4">
</div><!--row completed div-->
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label for="HRA_Rate">HRA Rate(%):</label><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();');
$data = array('name' => 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();','onchange'=>'calculalteHRA();');
echo form_input($data);
?>
</div>
</div>
</div>
</div><!--row completed div-->
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label for="HRA_Rate">HRA Amount:</label><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'HRA_Amount','id'=>'HRA_Amount','value' => set_value('HRA_Amount'), 'class' => 'form-control','style'=>'text-transform:uppercase;','readonly'=>'readonly');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="OT_Rate">OT Rate:</label><font color="Red">*</font>
@ -120,7 +148,17 @@
</div>
</div>
</div>
<div class="col-md-4">
</div><!--row completed div-->
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label for="Allowances">Allowances:</label><font color="Red">*</font>
<div class="form-group">
@ -132,11 +170,8 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-4">
<div class="form-group">
<label for="PF_Rate">PF Rate(%):</label><font color="Red">*</font>
@ -149,9 +184,6 @@
</div>
</div>
</div>
</div><!--row completed div-->
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label for="ESI_Rate">ESI Rate(%):</label><font color="Red">*</font>
@ -228,7 +260,26 @@
</div><!--content-wrapper closed-->
<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>
<script>
function calculalteHRA()
{
var Totalsalary = document.getElementById('Total_salary').value;;
var HRA=document.getElementById('HRA_Rate').value;
if(HRA==''){
alert("Please Enter HRA RATE..");
document.getElementById('HRA_Rate').focus();
}else if(Totalsalary==''){
alert("Please Enter Total Salary..");
document.getElementById('total_salary').focus();
}
else{
var temp=(Totalsalary*(HRA/100));
var basic=Totalsalary-temp;
document.getElementById('Basic_Pay').value=basic;
document.getElementById('HRA_Amount').value=temp;
}
}
</script>

12
application/views/editCapitalAmendPO.php
View File

@ -100,7 +100,7 @@ if(!empty($POMaster))
$SupName = $Req->SupplierName;
$Address = $Req->Address;
$pdt = new DateTime($Req->PODate);
$PODate = $pdt->format('Y-m-d');
$PODate = $pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule;
@ -108,7 +108,7 @@ if(!empty($POMaster))
if(!empty($Req->DeliveryDate))
{
$Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d');
$Deliverydt = $Ddt->format('d-m-Y');
}else{
$Deliverydt=null;
}
@ -121,7 +121,7 @@ if(!empty($POMaster))
$scopeofwork = $Req->ServiceDescription;
//$PayableAT=$Req->PayableAT;
$ExchangeRateOn1=new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateOn=$ExchangeRateOn1->format('Y-m-d');
$ExchangeRateOn=$ExchangeRateOn1->format('d-m-Y');
// $PaymentDays=$Req->PaymentDays;
$PaymentOtherDescription=$Req->PaymentOtherDescription;
$PaymentTerms=$Req->PaymentTerms;
@ -274,11 +274,11 @@ document.getElementById('dispatchinternational').style.display = 'block';
$("#PODate").datepicker({
//minDate : d,
maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#Deliverydate").datepicker({
minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#Date').click(function () {
//for Date range selection
@ -1666,6 +1666,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<?php $UpdatedOn=new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
$UpdatedOn=$UpdatedOn->format('d-m-Y');?>
<label>Request On :</label><?php echo $UpdatedOn;?><br/>
<label>Request By :</label><?php echo $requestedBy;?><br/>
<label>Status :</label><?php echo $PoStatusName;?>

80
application/views/editOldemppay.php
View File

@ -16,7 +16,9 @@
$Created_By='';
$Created_Time='';
$Last_Mod_By='';
$Last_Mod_Time='';
$Last_Mod_Time='';
$HRA_Amount='';
$TotalSalary='';
if(!empty($emppay))
@ -29,8 +31,10 @@ if(!empty($emppay))
$Pay_Data_ID=$ep->Pay_Data_ID;
$EmpID=$ep->EmpID;
$TotalSalary=$ep->TotalSalary;
$Basic_Pay=$ep->Basic_Pay;
$HRA_Rate=$ep->HRA_Rate;
$HRA_Amount=$ep->HRA_Amount;
$OT_Rate=$ep->OT_Rate;
$Allowances=$ep->Allowances;
$PF_Rate=$ep->PF_Rate;
@ -104,27 +108,56 @@ if(!empty($emppay))
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Basic Pay:</span><font color="Red">*</font>
<input type="text" class="form-control requried" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit">
<span for="Basic_Pay">Total Salary:</span><font color="Red">*</font>
<input type="text" class="form-control requried" id="total_salary" name="total_salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Basic Pay:</span><font color="Red">*</font>
<input type="text" class="form-control requried" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>" readonly>
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="HRA_Rate">HRA_Rate(%):</span><font color="Red">*</font>
<input type="text" class="form-control required" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
<input type="text" class="form-control required" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" onchange="calculateBasic();">
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="HRA_Rate">HRA_Amount:</span><font color="Red">*</font>
<input type="text" class="form-control required" id="HRA_Amount" name="HRA_Amount" value="<?php echo number_format($HRA_Amount,0,'',''); ?>" readonly>
</div>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="OT_Rate">OT_Rate:</span><font color="Red">*</font>
@ -132,9 +165,8 @@ if(!empty($emppay))
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
<span for="Allowances">Allowances:</span><font color="Red">*</font>
@ -142,12 +174,6 @@ if(!empty($emppay))
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<div class="form-group">
@ -294,4 +320,28 @@ if(!empty($emppay))
</section>
</div>
<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
<script>
function calculateBasic()
{
var Totalsalary = document.getElementById('total_salary').value;;
var HRA=document.getElementById('HRA_Rate').value;
if(HRA==''){
alert("Please Enter HRA RATE..");
document.getElementById('HRA_Rate').focus();
}else if(Totalsalary==''){
alert("Please Enter Total Salary..");
document.getElementById('total_salary').focus();
}
else{
var temp=(Totalsalary*(HRA/100));
var basic=Totalsalary-temp;
document.getElementById('Basic_Pay').value=basic;
document.getElementById('HRA_Amount').value=temp;
}
//alert(basic);
}
</script>

12
application/views/editRevenueAmendPO.php
View File

@ -2,7 +2,7 @@
<?php $ReqType ='';
$CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('Y-m-d');
$CurrentDate = $dt->format('d-m-Y');
$MaxPoDate = '';
$AvlAmount = 0;
$DeliverSchedule='';
@ -71,12 +71,12 @@ if(!empty($POMaster))
$Address = $Req->Address;
$Pdt = new DateTime($Req->PODate);
$PODate = $Pdt->format('Y-m-d');
$PODate = $Pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule;
$Ddt = new DateTime($Req->DeliveryDate);
//echo $Req->DeliveryDate."<br>";
$Deliverydt = $Ddt->format('Y-m-d');
$Deliverydt = $Ddt->format('d-m-Y');
//echo $Deliverydt;
$PaymentOtherDescription=$Req->PaymentOtherDescription;
//echo $PaymentOtherDescription;
@ -200,11 +200,11 @@ $(function() {
$("#PODate").datepicker({
minDate : d,
maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#Deliverydt").datepicker({
minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
/* $("#Requeston").datepicker({
//minDate : d,
@ -1732,6 +1732,8 @@ function calculateEditTaxValue()
</div>
</div>
<?php $Reqon=new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon=$Reqon->format('d-m-Y');?>
<label>Request On :</label><?php echo $Reqon;?><br/>
<label>Request By :</label><?php echo $Requestedby;?><br/>
<label>Status :</label><?php echo $POStatus;?>

11
application/views/editServiceAmendPO.php
View File

@ -59,12 +59,12 @@ if(!empty($POMaster))
$SupName = $Req->SupplierName;
$Address = $Req->Address;
$pdt = new DateTime($Req->PODate);
$PODate = $pdt->format('Y-m-d');
$PODate = $pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule;
// echo "*" . $Req->DeliveryDate . "*";
$Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d');
$Deliverydt = $Ddt->format('d-m-Y');
// echo "-" . $Deliverydt . "-";
$DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode;
@ -179,11 +179,11 @@ var AvilBudAmt = '';
$("#PODate").datepicker({
minDate : d,
maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#Deliverydt").datepicker({
minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#drpSupplier').change(function() {
@ -1305,7 +1305,8 @@ $(document).ready(function () {
<br/>
</div><br/>
<?php $Reqon=new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon=$Reqon->format('d-m-Y');?>
<label>Request On :</label><?php echo $Reqon;?><br/>
<label>Request By :</label><?php echo $RequesterName;?><br/>
<label>Status :</label><?php echo $StatusName;?>

4
application/views/emppayListing.php
View File

@ -36,8 +36,10 @@
<tr bgcolor="steelblue">
<th>Pay Data ID</th>
<th>Employee ID</th>
<th>Total Salary</th>
<th>Basic Pay</th>
<th>HRA Rate</th>
<th>HRA Amount</th>
<th>OT Rate</th>
<th>Allowances</th>
<th>PF Rate</th>
@ -59,8 +61,10 @@
<td><?php echo $record->Pay_Data_ID ?></td>
<td><?php echo $record->EmpID ?></td>
<td><?php echo $record->TotalSalary ?></td>
<td><?php echo $record->Basic_Pay ?></td>
<td><?php echo $record->HRA_Rate ?></td>
<td><?php echo $record->HRA_Amount ?></td>
<td><?php echo $record->OT_Rate ?></td>
<td><?php echo $record->Allowances ?></td>
<td><?php echo $record->PF_Rate ?></td>