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 @@
@@ -81,13 +81,16 @@ - - - - - - - - - - - - - + + + + + + + @@ -122,7 +123,8 @@
- + ">
@@ -131,7 +133,8 @@
- + ">
@@ -143,7 +146,8 @@
- + ">
@@ -152,12 +156,13 @@
- + ">
-

+

@@ -312,6 +317,7 @@ $( function() { dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, + orientation : "botttom" //numberOfMonths: 1 }) .on( "change", function() { @@ -321,6 +327,7 @@ $( function() { dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, + orientation : "bottom" //numberOfMonths: 1 }) .on( "change", function() { diff --git a/app/Views/Report_consolidate.php b/app/Views/Report_consolidate.php index 8a58eeeb..92ba7de0 100755 --- a/app/Views/Report_consolidate.php +++ b/app/Views/Report_consolidate.php @@ -71,8 +71,8 @@
-
-
+
+
@@ -84,7 +84,12 @@ {?> - + @@ -94,7 +99,7 @@
-
+
@@ -104,28 +109,41 @@ - + - +
-
-
+
+ +
+
+  
-

+

diff --git a/app/Views/Report_openorder.php b/app/Views/Report_openorder.php index b79259e3..414292c8 100755 --- a/app/Views/Report_openorder.php +++ b/app/Views/Report_openorder.php @@ -52,9 +52,9 @@
@@ -123,7 +123,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -160,7 +160,7 @@
-

+

diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 913a9c29..f64ea7f0 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -71,7 +71,7 @@ ">
-
+
@@ -84,7 +84,7 @@ endforeach; ?>
-
+
@@ -97,7 +97,7 @@ endforeach; ?>
-
+
@@ -110,7 +110,7 @@ endforeach; ?>
-
+
@@ -127,7 +127,7 @@

-
+
@@ -135,7 +135,7 @@
-
+
@@ -144,7 +144,7 @@
-
+
@@ -157,8 +157,7 @@ endforeach; ?>
-
-

+

diff --git a/app/Views/Report_supplier.php b/app/Views/Report_supplier.php index 1d73cc98..621132dd 100755 --- a/app/Views/Report_supplier.php +++ b/app/Views/Report_supplier.php @@ -73,7 +73,7 @@
-
+
@@ -86,20 +86,7 @@ endforeach; ?>
-
- - -
-
+
@@ -112,7 +99,7 @@ endforeach; ?>
-
+
@@ -126,10 +113,7 @@
-
-
-
-
+
@@ -137,7 +121,11 @@
-
+
+
+
+ +
@@ -146,8 +134,8 @@
-
-

+
+

diff --git a/app/Views/Report_totalorders.php b/app/Views/Report_totalorders.php index b00883e8..8af4e815 100755 --- a/app/Views/Report_totalorders.php +++ b/app/Views/Report_totalorders.php @@ -41,9 +41,9 @@
@@ -59,25 +59,34 @@
-
- -
-
- +
+
+ + +
+
+ +
+ @@ -178,4 +187,11 @@ $(document).ready(function() { } ); + + + \ No newline at end of file diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php index 106db822..1fdde443 100755 --- a/app/Views/Report_year_wise.php +++ b/app/Views/Report_year_wise.php @@ -4,9 +4,8 @@