diff --git a/app/Config/Routes.php b/app/Config/Routes.php index fe8150a7..a56d708e 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -547,4 +547,18 @@ $routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); //Reports Module -$routes->get('allReports','Report::allReports'); \ No newline at end of file +$routes->get('allReports','Report::allReports'); + +// Material Report Links +$routes->get('MM_Supplier', 'Report::MM_Supplier'); +$routes->get('MM_Item','Report::MM_Item'); +$routes->match(['GET', 'POST'],'MM_ReceiptValue','Report::MM_ReceiptValue'); + +//Inward Report Links +$routes->match(['GET', 'POST'],'ipurchase','Report::ipurchase'); +$routes->match(['GET', 'POST'],'iyear_wise', 'Report::iyear_wise'); +$routes->match(['GET', 'POST'],'ipurchase_supplier' , 'Report::ipurchase_supplier'); +$routes->match(['GET', 'POST'],'iconsolidate' , 'Report::iconsolidate'); +$routes->match(['GET', 'POST'],'icumulative' , 'Report::icumulative'); +$routes->match(['GET', 'POST'],'rawi_cumulative' , 'Report::rawi_cumulative'); +$routes->match(['GET', 'POST'],'rawi_consolidate' , 'Report::rawi_consolidate'); \ No newline at end of file diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 36f1c166..85f04e75 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -219,6 +219,8 @@ class Report extends BaseController $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; + $data['financialyear'] = $ab; $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['mmr'] = $this->dahsboard_Model->report_MMReceiptValue($fa, $aa, $m); } @@ -541,14 +543,20 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward PO Reports'; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $prod = $this->request->getPost('item_name'); + $data['item_name'] = $prod; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $cat = $this->request->getVar('cat'); $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $frm = $this->request->getPost('from_date'); + $data['frm'] = $frm; $t = $this->request->getPost('to_date'); + $data['t'] = $t; //print_r($prod); $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 3bfa49d0..87de7b9f 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -875,7 +875,9 @@ group by po.SupplierID,pl.MaterialCode"; { - $sql = "SELECT MaterialCode,MaterialName,UOM,Category,HSNCODE FROM t_materialmaster group by MaterialCode"; + $sql = "SELECT MaterialCode,MaterialName,UOM, t_configdetails.ConfigValue as Category,HSNCODE FROM t_materialmaster + join t_configdetails on t_configdetails.key = t_materialmaster.Category + group by MaterialCode"; $query = $this->db->query($sql); return $query->getResult(); } diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index c03055cd..52025981 100755 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -36,9 +36,9 @@

  Material Master

-

Material Master - supplier wise

-

Material Master - Item wise

-

Material Master - Receipt Value

+

Material Master - supplier wise

+

Material Master - Item wise

+

Material Master - Receipt Value