From 9d1a5e571e25c8271e9ac449fb174e0ef7606ceb Mon Sep 17 00:00:00 2001 From: velz2020 Date: Thu, 31 Aug 2017 14:40:07 +0530 Subject: [PATCH] PAYROLL ISSUE FIXED. --- application/views/addemppaydate.php | 38 +++++++++++----------- application/views/advancerequest.php | 2 +- application/views/editOldemppay.php | 36 ++++++++++---------- application/views/editOldmonthly.php | 4 +-- application/views/payslipgenerateprint.php | 6 ++-- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php index 57f9ba37..7b2619c5 100755 --- a/application/views/addemppaydate.php +++ b/application/views/addemppaydate.php @@ -11,7 +11,7 @@ $("#loan_issued_date").datepicker({ $("#due_started").datepicker({ minDate :'now', //maxDate : 'now', - dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1' }); }); @@ -70,7 +70,7 @@ $("#due_started").datepicker({
- * + *
- * + *
- * + *
- * + *
- * + *
- * + *
'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'[0-9]{1,4}' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 4 digit'); + $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern="([0-9]{1,2}([.][0-9]{1,2})?' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 4 digit'); echo form_input($data); ?> @@ -180,7 +180,7 @@ $("#due_started").datepicker({
- * + *
- * + *
- * + *
- * + *
- Loan Issue(d) Date: + Loan Issue(d) Date
@@ -265,7 +265,7 @@ $("#due_started").datepicker({
- Monthly Due(s): + Monthly Due
@@ -273,7 +273,7 @@ $("#due_started").datepicker({
- Due Started: + Due Started
@@ -281,7 +281,7 @@ $("#due_started").datepicker({
- No Of Due(s): + No Of Due(s)
@@ -289,13 +289,13 @@ $("#due_started").datepicker({
- Paid Amount: + Paid Amount
- - + +
diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php index 0c15ffac..ad856a28 100755 --- a/application/views/advancerequest.php +++ b/application/views/advancerequest.php @@ -180,7 +180,7 @@ $(function() {

- +
diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php index c178a43c..f767dca3 100755 --- a/application/views/editOldemppay.php +++ b/application/views/editOldemppay.php @@ -11,7 +11,7 @@ $("#loan_issued_date").datepicker({ $("#due_started").datepicker({ minDate :'now', //maxDate : 'now', - dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1' }); }); @@ -136,7 +136,7 @@ if(!empty($emppay))
- Employee ID: + Employee ID
@@ -146,7 +146,7 @@ if(!empty($emppay))
- Total Salary:* + Total Salary*
@@ -160,7 +160,7 @@ if(!empty($emppay))
- Basic Pay:* + Basic Pay*
@@ -169,7 +169,7 @@ if(!empty($emppay))
- HRA_Rate(%):* + HRA_Rate(%)*
@@ -178,7 +178,7 @@ if(!empty($emppay))
- HRA_Amount:* + HRA_Amount*
@@ -198,8 +198,8 @@ if(!empty($emppay))
- OT_Rate:* - + OT_Rate* +
@@ -207,7 +207,7 @@ if(!empty($emppay))
- Allowances:* + Allowances*
@@ -215,7 +215,7 @@ if(!empty($emppay))
- PF_Rate(%):* + PF_Rate(%)*
@@ -225,7 +225,7 @@ if(!empty($emppay))
- ESI_Rate(%):* + ESI_Rate(%)*
@@ -234,7 +234,7 @@ if(!empty($emppay))
- Food Allowances:* + Food Allowances*
@@ -252,7 +252,7 @@ if(!empty($emppay)) Loan Amount - +
@@ -263,7 +263,7 @@ if(!empty($emppay))
- Loan Issue(d) Date: + Loan Issue(d) Date
@@ -273,7 +273,7 @@ if(!empty($emppay))
- Monthly Due(s): + Monthly Due
@@ -281,7 +281,7 @@ if(!empty($emppay))
- Due Started: + Due Started
@@ -289,7 +289,7 @@ if(!empty($emppay))
- No Of Due(s): + No Of Due(s)
@@ -298,7 +298,7 @@ if(!empty($emppay))
- Paid Amount: + Paid Amount
diff --git a/application/views/editOldmonthly.php b/application/views/editOldmonthly.php index 35e6c809..d9acb46b 100755 --- a/application/views/editOldmonthly.php +++ b/application/views/editOldmonthly.php @@ -62,7 +62,7 @@ else{ function validateOTHRS(){ var x = $("#OT_Hrs_Worked").val(); - var ck_lopdays = /^[0-9 ]{1,3}$/; + var ck_lopdays = /^[0-9]{1,2}([.][0-9]{1,2}$/;//[0-9]{1,2}([.][0-9]{1,2} if(!(ck_lopdays.test(x) && x<=150)){ $("#OT_Hrs_Worked").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"}); @@ -220,7 +220,7 @@ function validateAll(){
OverTime Hours Worked: - +
diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php index 61a3466a..b67626f9 100755 --- a/application/views/payslipgenerateprint.php +++ b/application/views/payslipgenerateprint.php @@ -9,6 +9,7 @@ $Designation = ''; $Departmentcode = ''; $PANNo = ''; + $UANNO=''; $BankAccountNo = ''; $IFSCCode =''; $BankBranchName = ''; @@ -70,6 +71,7 @@ if(!empty($PayDetails)) $Designation = $Pay->Designation; $PANNo =$Pay->Pan; + $UANNO=$Pay->UANNO; $BankAccountNo = $Pay->BankAccountNumber; $IFSCCode =$Pay->IFSCCode; $BankBranchName = $Pay->BankName; @@ -232,11 +234,11 @@ if($RecCount > 0) Bank Account Number : UAN Number : -101033275864 + PAN Number : - QWERS3423E +