diff --git a/application/config/routes.php b/application/config/routes.php index ee3af1c1..e2645edb 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -227,6 +227,11 @@ $route['Report_cumulative'] = "report/cumulative"; $route['cashbookreport']="report/cashbook"; $route['cashbookmonthlyexpenses']="report/monthexpenses"; $route['cashbookyearlyexpenses']="report/yearexpenses"; +$route['Report_purchase_inward'] = "report/ipurchase"; +$route['Report_year_wise_inward'] = "report/iyear_wise"; +$route['Report_supplier_inward'] = "report/ipurchase_supplier"; +$route['Report_consolidate_inward'] = "report/iconsolidate"; +$route['Report_cumulative_inward'] = "report/icumulative"; // Company Information $route['companyview'] = 'companycontroller/companyview'; diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index 01570f64..1f558bbd 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -5,7 +5,7 @@ require APPPATH . '/third_party/mpdf/mpdf.php'; /** - * Class : Employee (Employee Controller) + * Class : payslip (Pay Slip - Controller) * User Class to control all user related operations. * @author : Venba Info Tech * @version : 1.1 diff --git a/application/controllers/user.php b/application/controllers/user.php index f6c52b1f..10b7eed8 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -51,7 +51,7 @@ class user extends BaseController $data['totalservicepo']=$this->dahsboard_Model->totalservicepo(); $data['totalrevenuepo']=$this->dahsboard_Model->totalrevenuepo(); $data['totalimportpo']=$this->dahsboard_Model->totalimportpo(); - $data['totalcapitalpo']=$this->dahsboard_Model->totalcapitalpo(); + //$data['totalcapitalpo']=$this->dahsboard_Model->totalcapitalpo(); $data['details']=$this->dahsboard_Model->reqdetail(); diff --git a/application/views/Report_cumulative_day.php b/application/views/Report_cumulative_day.php index 143f9b64..2f91e33e 100644 --- a/application/views/Report_cumulative_day.php +++ b/application/views/Report_cumulative_day.php @@ -60,7 +60,7 @@ if(!empty($mms)) tquantity); echo round($rel->tquantity);?> ttotal); - echo round($rel->ttotal);?> - + $tvt= $tvt + number_format($rel->ttotal,2,'.',''); + echo number_format($rel->ttotal,2,'.','');?> diff --git a/application/views/Report_cumulative_month.php b/application/views/Report_cumulative_month.php index 6e17918e..b8ab3a23 100644 --- a/application/views/Report_cumulative_month.php +++ b/application/views/Report_cumulative_month.php @@ -61,7 +61,7 @@ if(!empty($mms)) = 4) { $yearl = date('Y').'-'.(date('Y')+1); } else { @@ -82,9 +82,10 @@ if(!empty($mms)) $tqt= $tqt + round($rel->tquantity); echo round($rel->tquantity);?> ttotal); - echo round($rel->ttotal);?> - + $tvt= $tvt + number_format($rel->ttotal,2,'.',''); + echo number_format($rel->ttotal,2,'.','');?> + + diff --git a/application/views/Report_cumulative_year.php b/application/views/Report_cumulative_year.php index 8c03818f..1b33f1bf 100644 --- a/application/views/Report_cumulative_year.php +++ b/application/views/Report_cumulative_year.php @@ -88,8 +88,8 @@ if(!empty($mms)) $tqt= $tqt + round($rel->tquantity); echo round($rel->tquantity);?> ttotal); - echo round($rel->ttotal);?> + $tvt= $tvt + number_format($rel->ttotal,2,'.',''); + echo number_format($rel->ttotal,2,'.','');?> @@ -126,7 +126,7 @@ if(!empty($mms)) diff --git a/application/views/Report_month_wise.php b/application/views/Report_month_wise.php index c26a547f..1ee96bc3 100644 --- a/application/views/Report_month_wise.php +++ b/application/views/Report_month_wise.php @@ -72,8 +72,8 @@ if(!empty($mms)) $tr3= $tr3 + round($rel->quantity); echo $rel->quantity;?> total; - echo $rel->total;?> + $tr4= $tr4 + number_format($rel->total,2,'.',''); + echo number_format($rel->total,2,'.','');?> diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php index efbd80a3..fd5421c9 100755 --- a/application/views/Report_openorder.php +++ b/application/views/Report_openorder.php @@ -83,7 +83,7 @@ if(!empty($open_po)) CreatedDate?> ApprovedDate?> Dept_Name?> - TotalOrderValue?> + TotalOrderValue,2,'.','')?> diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php index 5d8a01a8..e9898f67 100755 --- a/application/views/Report_purchase.php +++ b/application/views/Report_purchase.php @@ -97,7 +97,7 @@ if(!empty($mms)) -



+
-
+ +

@@ -263,7 +264,7 @@ if(!empty($mms)) echo $rel->Package;?> total,2); - echo round($rel->total,2);?> + echo number_format($rel->total,2,'.','');?> @@ -312,7 +313,7 @@ if(!empty($mms)) @@ -332,7 +333,9 @@ if(!empty($mms)) @@ -362,7 +365,8 @@ if(!empty($mms))
+
- +
+
+ +
+
@@ -112,8 +113,8 @@ if(!empty($mms)) $tr3= $tr3 + $rel->quantity; echo round($rel->quantity);?> total; - echo $rel->total;?> + $tr4= $tr4 + number_format($rel->total,2,'.',''); + echo number_format($rel->total,2,'.','');?> @@ -146,8 +147,8 @@ if(!empty($mms)) diff --git a/application/views/Report_year_wise_total.php b/application/views/Report_year_wise_total.php index fb603cff..a693aa29 100644 --- a/application/views/Report_year_wise_total.php +++ b/application/views/Report_year_wise_total.php @@ -71,8 +71,8 @@ if(!empty($mms)) $tr3= $tr3 + round($rel->quantity); echo round($rel->quantity);?> total; - echo $rel->total;?> + $tr4= $tr4 + number_format($rel->total,2,'.',''); + echo number_format($rel->total,2,'.','');?> diff --git a/application/views/Reportcashbook.php b/application/views/Reportcashbook.php index 32e564ea..2a516d1b 100644 --- a/application/views/Reportcashbook.php +++ b/application/views/Reportcashbook.php @@ -160,7 +160,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
- +
@@ -173,7 +173,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
- +
diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 32925d3b..724a4ab5 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -642,99 +642,8 @@ $(function() { Advance Request - - - -
  • - Reports - -
    • - - - @@ -745,6 +654,7 @@ $(function() { +
  • profilepic != '') { ?> diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php index a9cae10b..7bcf4da9 100755 --- a/application/views/monthlypayinputs.php +++ b/application/views/monthlypayinputs.php @@ -49,7 +49,8 @@ $('html').bind('keypress', function(e)
    -
    +

    The Red highlighted Employee have loan to pay. Put 'NA' for Skip Current Month Loan Due.

    +
    diff --git a/application/views/payslipeditable.php b/application/views/payslipeditable.php index d949c209..5ac38fcf 100755 --- a/application/views/payslipeditable.php +++ b/application/views/payslipeditable.php @@ -82,7 +82,7 @@ $("#Employee").empty();

    -
    Siddharth Industries - PaySlip Create and Update
    +
    Resico Industries - PaySlip Create and Update

    diff --git a/application/views/payslipgenerate.php b/application/views/payslipgenerate.php index 2436cece..9b434896 100755 --- a/application/views/payslipgenerate.php +++ b/application/views/payslipgenerate.php @@ -189,7 +189,7 @@ $(function() {

    -
    Siddharth Industries - PaySlip Generator
    +
    Resico Industries - PaySlip Generator

    diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php index f576f751..2ac37ed1 100755 --- a/application/views/payslipgenerateprint.php +++ b/application/views/payslipgenerateprint.php @@ -189,7 +189,7 @@ if($RecCount > 0)
    -
    SIDDHARTH INDUSTRIES
    Survey No: 168/1C3,Pennalur Pet Road,Goonipalyam village,
    Uthukottai Taluk,Tiruvallur Dist, Chennai,Tamilnadu,Pin code : 602026.
    PaySlip for the Month of
    +
    INDUSTRIES
    Survey No: 168/1C3,Pennalur Pet Road,Goonipalyam village,
    Uthukottai Taluk,Tiruvallur Dist, Chennai,Tamilnadu,Pin code : 602026.
    PaySlip for the Month of
    diff --git a/application/views/payslipupload.php b/application/views/payslipupload.php index 92a73d32..3b28ccd1 100755 --- a/application/views/payslipupload.php +++ b/application/views/payslipupload.php @@ -21,7 +21,7 @@

    -
    Siddharth Industries PaySlip Upload
    +
    Resico Industries PaySlip Upload

    diff --git a/application/views/payslipupload2.php b/application/views/payslipupload2.php index bf5e3f2c..76c1b69b 100755 --- a/application/views/payslipupload2.php +++ b/application/views/payslipupload2.php @@ -38,7 +38,7 @@ function checkYearMonthAsEmpty()

    -
    Siddharth Industries - Monthly Pay Inputs Upload
    +
    Resico Industries - Monthly Pay Inputs Upload