diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php
index e62a8164..50d81424 100755
--- a/app/Controllers/Payslip.php
+++ b/app/Controllers/Payslip.php
@@ -515,7 +515,7 @@ class Payslip extends BaseController
// $Incentives = $j['Incentives in ₹'];
$Festival_Bonus = $j['Festival Bonus in ₹'];
$Other_Deductions = $j['TDS Deductions in ₹'];
- $Estimate = $j['Estimate in ₹'];
+ $Estimate = $j['Net Salary ₹'];
$Created_By = $this->session->get('userId');
if (!is_numeric($DaysWorked) || ($DaysWorked > 31) || (strlen((string)$DaysWorked)) > 5) {
@@ -618,7 +618,7 @@ class Payslip extends BaseController
$Festival_Bonus = isset($j['Festival Bonus in ₹']) ? $j['Festival Bonus in ₹'] : 0.00;
$tds_Deductions = isset($j['TDS Deductions in ₹']) ? $j['TDS Deductions in ₹'] : 0.00;
- $Estimate = isset($j['Estimate in ₹']) ? $j['Estimate in ₹'] : 0.00;
+ $Estimate = isset($j['Net Salary ₹']) ? $j['Net Salary ₹'] : 0.00;
$Created_By = $this->session->get('userId');
if($is_driver == 0){
diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index 8d087f7e..0e7e645c 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -26,14 +26,16 @@ class Ipinvoice_model extends Model
ip_products.product_name, ip_invoice_items.item_price, ip_products.cgst, ip_products.sgst,
ip_invoice_items.item_quantity, ip_invoice_items.item_price, ip_invoice_items.item_name, ip_invoice_items.item_quantity,ip_invoice_items.hsn_or_sac,
ip_invoice_amounts.invoice_total, ip_invoice_amounts.invoice_item_subtotal, ip_invoice_amounts.invoice_item_tax_total
- ,ip_invoice_attachment.file_name , ip_invoices.received_qty')
+ ,ip_invoice_attachment.file_name , ip_invoices.received_qty , VN.invoice_custom_fieldvalue as vehicle_no , DN.invoice_custom_fieldvalue as deiver_name')
->join('ip_payment_methods', 'ip_invoices.payment_method = ip_payment_methods.payment_method_id', 'left')
->join('ip_clients', 'ip_invoices.client_id = ip_clients.client_id', 'left')
->join('ip_users', 'ip_invoices.user_id = ip_users.user_id', 'left')
->join('ip_invoice_items', 'ip_invoices.invoice_id = ip_invoice_items.invoice_id', 'left')
->join('ip_products', 'ip_invoice_items.item_product_id = ip_products.product_id', 'left')
->join('ip_invoice_amounts', 'ip_invoices.invoice_id = ip_invoice_amounts.invoice_id', 'left')
- ->join('ip_invoice_attachment', 'ip_invoices.invoice_id = ip_invoice_attachment.invoice_id and ip_invoice_attachment.is_active = 1' , 'left');
+ ->join('ip_invoice_attachment', 'ip_invoices.invoice_id = ip_invoice_attachment.invoice_id and ip_invoice_attachment.is_active = 1' , 'left')
+ ->join('ip_invoice_custom VN', 'ip_invoices.invoice_id = VN.invoice_id and VN.invoice_custom_fieldid = 8' , 'left')
+ ->join('ip_invoice_custom DN', 'ip_invoices.invoice_id = DN.invoice_id and DN.invoice_custom_fieldid = 58' , 'left');
$builder->where('ip_invoices.invoice_date_created >=', $fromDate );
$builder->where('ip_invoices.invoice_date_created <=', $toDate );
$builder->orderBy('ip_invoices.invoice_number', 'DESC');
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index 01592c6a..087d0abb 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -366,12 +366,13 @@ $currentday = date('d');
$flag2 = 0;
$todayflag = 0;
} ?>
- | Total Hrs |
- OT Hrs |
- Paid Leave |
+
Days Worked |
Absent |
- Total Sunday |
+ Paid Leave |
+ Sunday |
+ Worked Hrs |
+ OT Hrs |
@@ -460,27 +461,8 @@ $currentday = date('d');
$flag2 = 0;
$todayflag = 0;
} ?>
-
- Total_WHrs)) {
- echo $a->Total_WHrs;
- } else {
- echo "0.00";
- } ?>
- |
-
- Total_OTHrs)) {
- echo $a->Total_OTHrs;
- } else {
- echo "0.00";
- } ?>
- |
-
-
- |
+
+
Days_Worked)) {
echo $a->Days_Worked;
@@ -495,6 +477,13 @@ $currentday = date('d');
echo "0.00";
} ?>
|
+
+
+ |
|
+
+ Total_WHrs)) {
+ echo $a->Total_WHrs;
+ } else {
+ echo "0.00";
+ } ?>
+ |
+
+ Total_OTHrs)) {
+ echo $a->Total_OTHrs;
+ } else {
+ echo "0.00";
+ } ?>
+ |
+
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index 41702239..b97620a9 100755
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -123,10 +123,11 @@
-