diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php index 5dfe7175..ceac3f1a 100755 --- a/app/Controllers/Monthlypay.php +++ b/app/Controllers/Monthlypay.php @@ -212,91 +212,91 @@ class Monthlypay extends BaseController $EmpID = $data['EmpID']; - $W1H = $data['1W']; - $W1OT = $data['1OT']; - $W2H = $data['2W']; - $W2OT = $data['2OT']; - $W3H = $data['3W']; - $W3OT = $data['3OT']; - $W4H = $data['4W']; - $W4OT = $data['4OT']; - $W5H = $data['5W']; - $W5OT = $data['5OT']; - $W6H = $data['6W']; - $W6OT = $data['6OT']; - $W7H = $data['7W']; - $W7OT = $data['7OT']; - $W8H = $data['8W']; - $W8OT = $data['8OT']; - $W9H = $data['9W']; - $W9OT = $data['9OT']; - $W10H = $data['10W']; - $W10OT = $data['10OT']; - $W11H = $data['11W']; - $W11OT = $data['11OT']; - $W12H = $data['12W']; - $W12OT = $data['12OT']; - $W13H = $data['13W']; - $W13OT = $data['13OT']; - $W14H = $data['14W']; - $W14OT = $data['14OT']; - $W15H = $data['15W']; - $W15OT = $data['15OT']; - $W16H = $data['16W']; - $W16OT = $data['16OT']; - $W17H = $data['17W']; - $W17OT = $data['17OT']; - $W18H = $data['18W']; - $W18OT = $data['18OT']; - $W19H = $data['19W']; - $W19OT = $data['19OT']; - $W20H = $data['20W']; - $W20OT = $data['20OT']; - $W21H = $data['21W']; - $W21OT = $data['21OT']; - $W22H = $data['22W']; - $W22OT = $data['22OT']; - $W23H = $data['23W']; - $W23OT = $data['23OT']; - $W24H = $data['24W']; - $W24OT = $data['24OT']; - $W25H = $data['25W']; - $W25OT = $data['25OT']; - $W26H = $data['26W']; - $W26OT = $data['26OT']; - $W27H = $data['27W']; - $W27OT = $data['27OT']; - $W28H = $data['28W']; - $W28OT = $data['28OT']; + $W1H = $data['1W'] ?? NULL; + $W1OT = $data['1OT'] ?? NULL; + $W2H = $data['2W'] ?? NULL; + $W2OT = $data['2OT'] ?? NULL; + $W3H = $data['3W'] ?? NULL; + $W3OT = $data['3OT'] ?? NULL; + $W4H = $data['4W'] ?? NULL; + $W4OT = $data['4OT'] ?? NULL; + $W5H = $data['5W'] ?? NULL; + $W5OT = $data['5OT'] ?? NULL; + $W6H = $data['6W'] ?? NULL; + $W6OT = $data['6OT'] ?? NULL; + $W7H = $data['7W'] ?? NULL; + $W7OT = $data['7OT'] ?? NULL; + $W8H = $data['8W'] ?? NULL; + $W8OT = $data['8OT'] ?? NULL; + $W9H = $data['9W'] ?? NULL; + $W9OT = $data['9OT'] ?? NULL; + $W10H = $data['10W'] ?? NULL; + $W10OT = $data['10OT'] ?? NULL; + $W11H = $data['11W'] ?? NULL; + $W11OT = $data['11OT'] ?? NULL; + $W12H = $data['12W'] ?? NULL; + $W12OT = $data['12OT'] ?? NULL; + $W13H = $data['13W'] ?? NULL; + $W13OT = $data['13OT'] ?? NULL; + $W14H = $data['14W'] ?? NULL; + $W14OT = $data['14OT'] ?? NULL; + $W15H = $data['15W'] ?? NULL; + $W15OT = $data['15OT'] ?? NULL; + $W16H = $data['16W'] ?? NULL; + $W16OT = $data['16OT'] ?? NULL; + $W17H = $data['17W'] ?? NULL; + $W17OT = $data['17OT'] ?? NULL; + $W18H = $data['18W'] ?? NULL; + $W18OT = $data['18OT'] ?? NULL; + $W19H = $data['19W'] ?? NULL; + $W19OT = $data['19OT'] ?? NULL; + $W20H = $data['20W'] ?? NULL; + $W20OT = $data['20OT'] ?? NULL; + $W21H = $data['21W'] ?? NULL; + $W21OT = $data['21OT'] ?? NULL; + $W22H = $data['22W'] ?? NULL; + $W22OT = $data['22OT'] ?? NULL; + $W23H = $data['23W'] ?? NULL; + $W23OT = $data['23OT'] ?? NULL; + $W24H = $data['24W'] ?? NULL; + $W24OT = $data['24OT'] ?? NULL; + $W25H = $data['25W'] ?? NULL; + $W25OT = $data['25OT'] ?? NULL; + $W26H = $data['26W'] ?? NULL; + $W26OT = $data['26OT'] ?? NULL; + $W27H = $data['27W'] ?? NULL; + $W27OT = $data['27OT'] ?? NULL; + $W28H = $data['28W'] ?? NULL ; + $W28OT = $data['28OT'] ?? NULL; if (!empty($data['29W'])) { $W29H = $data['29W']; } else { - $W29H = null; + $W29H = NULL; } if (!empty($data['29OT'])) { $W29OT = $data['29OT']; } else { - $W29OT = null; + $W29OT = NULL; } if (!empty($data['30W'])) { $W30H = $data['30W']; } else { - $W30H = null; + $W30H = NULL; } if (!empty($data['30OT'])) { $W30OT = $data['30OT']; } else { - $W30OT = null; + $W30OT = NULL; } if (!empty($data['31W'])) { $W31H = $data['31W']; } else { - $W31H = null; + $W31H = NULL; } if (!empty($data['31OT'])) { $W31OT = $data['31OT']; } else { - $W31OT = null; + $W31OT = NULL; } $totalworkinghrs = $data['Worked Hrs']; $totalothrs = $data['OT Hrs']; diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index 5841a5cd..67973513 100644 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -31,9 +31,6 @@

Pending Purchase

Purchase - Supplier Wise

Purchase - Consolidate

-

HSN - Sales Register

-

HSN - Credit Register

-

HSN - Summary Register

  Material Master

@@ -84,6 +81,9 @@

  Sales Reports

Invoice Report

+

HSN - Sales Register

+

HSN - Credit Register

+

HSN - Summary Register