diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index b1b5509c..ebc4f3e7 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -79,6 +79,11 @@ class Report extends BaseController $agt = $this->request->getPost('aging_to'); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['pending_list'] = $this->dahsboard_Model->req_list($fa, $aa, $m, $frm, $t, $agf, $agt); + $data['givenYear'] = $ab ; + $data['givenMonth']= $m ; + $data['givenFrm'] = $frm ; + $data['givenTo'] = $t; + //print_r($data); } $data['finyear'] = $this->dahsboard_Model->report_finyear(); @@ -105,7 +110,13 @@ class Report extends BaseController $agt = $this->request->getPost('total_order_value_To'); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['rel_po'] = $this->dahsboard_Model->report_relpo($fa, $aa, $m, $frm, $t, $agf, $agt); - //print_r($data); + + $data['givenYear'] = $ab ; + $data['givenMonth']= $m ; + $data['givenFrm'] = $frm ; + $data['givenTo'] = $t; + $data['givenAgf'] = $agf; + $data['givenAgt'] = $agt; @@ -155,6 +166,8 @@ class Report extends BaseController $aa = substr((string)$ab, 5, 5); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['Total'] = $this->dahsboard_Model->report_total($fa, $aa); + + $data['givenYear'] = $ab ; } $data['finyear'] = $this->dahsboard_Model->report_finyear(); @@ -318,6 +331,7 @@ class Report extends BaseController $b = substr((string)$ab, 5, 5); $data['year'] = $this->dahsboard_Model->report_year_wise($a, $b); $data['finyear'] = $this->dahsboard_Model->report_finyear(); + $data['givenFinancialYear'] = $ab; //$this->loadviews("Report_year_wise",$this->global,$data, NULL); } @@ -377,6 +391,13 @@ class Report extends BaseController $data['cust'] = $this->dahsboard_Model->customer_name(); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['spurchse'] = $this->dahsboard_Model->report_supplier($cname, $fa, $aa, $m, $frm, $t); + $data['cname'] = $cname; + $data['ab'] = $ab; + $data['m'] = $m; + $data['frm'] = $frm; + $data['t'] = $t; + + } $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -400,6 +421,10 @@ class Report extends BaseController $data['cust'] = $this->dahsboard_Model->customer_name(); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['spurchse'] = $this->dahsboard_Model->report_consolidate($cname, $fa, $aa); + + $data['cname'] = $cname; + $data['ab'] = $ab; + } $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); diff --git a/app/Views/Report_POreleased.php b/app/Views/Report_POreleased.php index 818e3677..18f51c1d 100755 --- a/app/Views/Report_POreleased.php +++ b/app/Views/Report_POreleased.php @@ -52,9 +52,9 @@