diff --git a/application/controllers/report.php b/application/controllers/report.php index ea54f018..02d2f505 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -779,11 +779,11 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - $mat=$this->input->get('mid'); + //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); //print_r($sup); - $data['cum_year']=$this->dahsboard_Model->rawi_report_cum_year($mat,$cat); + $data['cum_year']=$this->dahsboard_Model->rawi_report_cum_year($cat); $this->loadviews("Report_cumulative_year_raw",$this->global,$data, NULL); } @@ -791,12 +791,12 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - $mat=$this->input->get('mid'); + //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); //print_r($prod); - $data['cum_month']=$this->dahsboard_Model->rawi_report_cum_month($mat,$cat); + $data['cum_month']=$this->dahsboard_Model->rawi_report_cum_month($cat); $this->loadviews("Report_cumulative_month_raw",$this->global,$data, NULL); } @@ -804,11 +804,11 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - $mat=$this->input->get('mid'); + //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); //print_r($prod); - $data['cum_day']=$this->dahsboard_Model->rawi_report_cum_day($mat,$cat); + $data['cum_day']=$this->dahsboard_Model->rawi_report_cum_day($cat); $this->loadviews("Report_cumulative_day_raw",$this->global,$data, NULL); } @@ -822,7 +822,7 @@ class report extends BaseController $fa=substr($ab,0,-5); $aa=substr($ab,5,5); //print_r($prod); - $data['material']=$this->dahsboard_Model->material_name(); + $data['material']=$this->dahsboard_Model->category(); $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['spurchse']=$this->dahsboard_Model->rawi_report_consolidate($cname,$fa,$aa); @@ -844,7 +844,7 @@ class report extends BaseController //$this->input->post('btn_submit'); $cat = $this->input->get('cat'); $sup = $this->input->get('sup'); - $mat = $this->input->get('mid'); + //$mat = $this->input->get('mid'); $m = $this->input->get('m'); $ab=$this->input->get('ab'); $fa=substr($ab,0,-5); @@ -853,7 +853,7 @@ class report extends BaseController $data['material']=$this->dahsboard_Model->material_name(); $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); - $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_month($m,$cat,$sup,$mat,$fa,$aa); + $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_month($m,$cat,$sup,$fa,$aa); // print_r( $data['spurchse']); if($this->DEPCode == MANAGEMENT) { @@ -872,7 +872,7 @@ class report extends BaseController //$this->input->post('btn_submit'); $cat = $this->input->get('cat'); $sup = $this->input->get('sup'); - $mat = $this->input->get('mid'); + //$mat = $this->input->get('mid'); $ab=$this->input->get('ab'); $fa=substr($ab,0,-5); $aa=substr($ab,5,5); @@ -880,7 +880,7 @@ class report extends BaseController $data['material']=$this->dahsboard_Model->material_name(); $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); - $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_year($cat,$sup,$mat,$fa,$aa); + $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_year($cat,$sup,$fa,$aa); // print_r( $data['spurchse']); if($this->DEPCode == MANAGEMENT) { diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index a55f7c3b..79978e4a 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -494,7 +494,7 @@ group by PONO,POType,Dept_Name"; function report_total($fa,$aa){ - $sql="select Dept_Details.DepartmentName As Dept_Name, + $sql="select ifnull(Dept_Details.DepartmentName,'-') As Dept_Name, SUM(CASE WHEN Mast.Status = 'ST015' THEN 1 ELSE 0 END) AS PO_Created, SUM(CASE WHEN Mast.Status = 'ST025' THEN 1 ELSE 0 END) AS Approved, SUM(CASE WHEN Mast.Status = 'ST051' THEN 1 ELSE 0 END) AS Approver_Onhold, @@ -506,9 +506,8 @@ group by PONO,POType,Dept_Name"; SUM(CASE WHEN Mast.Status = 'ST045' THEN 1 ELSE 0 END) AS MRIR_Rejected, SUM(CASE WHEN Mast.Status = 'ST056' THEN 1 ELSE 0 END) AS Special_po from T_PO_Detail Mast -JOIN T_Requestion_Master as Req on Req.ReqNo=Mast.ReqNo -JOIN T_Employee_Details as Emp_Det on Emp_Det.EmpID=Req.RequestedBy -JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode=Emp_Det.Departmentcode +left JOIN T_Requestion_Master as Req on Req.ReqNo=Mast.ReqNo +left JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode=Req.RequestedDept where Mast.PODate >= '".$fa."-04-01' and Mast.PODate <= '".$aa."-03-31' group by Dept_Name"; $query = $this->db->query($sql); @@ -811,6 +810,11 @@ group by month(created_date)"; $sql="SELECT distinct MaterialName FROM T_MaterialMaster;"; $query = $this->db->query($sql); return $query->result(); + } + function category(){ + $sql="SELECT distinct Category FROM T_MaterialMaster;"; + $query = $this->db->query($sql); + return $query->result(); } function report_month_wise($mont){ $month= date("m",strtotime($mont)); @@ -1503,45 +1507,45 @@ group by supplier_name,material_name"; } function rawi_report_cumulative(){ - $sql="SELECT year.mid as mid,year.category as category,year.material_name as material_name,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal -FROM (SELECT mm.Category as category,mm.MaterialCode as mid,ifnull(mm.MaterialName,'-') as material_name,ifnull(sum(pl.Quantity),0) as quantity,round(ifnull(sum(pl.Quantity * pl.Rate),0),2) as total + $sql="SELECT year.category as category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal +FROM (SELECT mm.Category as category,ifnull(sum(pl.Quantity),0) as quantity,round(ifnull(sum(pl.Quantity * pl.Rate),0),2) as total FROM T_PurchaseOrder_Master pm left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and case - when (month(pm.PODate) >=4) then - (YEAR(pm.PODate) = YEAR(CURRENT_DATE) and MONTH(pm.PODate) >= 4 ) or ( YEAR(pm.PODate) = YEAR(CURRENT_DATE)+1 and MONTH(pm.PODate) <= 3 ) + when (month(pm.CreatedDate) >=4) then + (YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE) and MONTH(pm.CreatedDate) >= 4 ) or ( YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE)+1 and MONTH(pm.CreatedDate) <= 3 ) else - (YEAR(pm.PODate) = YEAR(CURRENT_DATE)-1 and MONTH(pm.PODate) >= 4 ) or ( YEAR(pm.PODate) = YEAR(CURRENT_DATE) and MONTH(pm.PODate) <= 3 ) + (YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE)-1 and MONTH(pm.CreatedDate) >= 4 ) or ( YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE) and MONTH(pm.CreatedDate) <= 3 ) end -group by category,material_name +group by category ) as year left join -(SELECT mm.Category as category,mm.MaterialCode as mid,ifnull(mm.MaterialName,'-') as material_name,ifnull(sum(pl.Quantity),0) as mquantity,round(ifnull(sum(pl.Quantity * pl.Rate),0),2) as mtotal +(SELECT mm.Category as category,ifnull(sum(pl.Quantity),0) as mquantity,round(ifnull(sum(pl.Quantity * pl.Rate),0),2) as mtotal FROM T_PurchaseOrder_Master pm left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -month(pm.PODate) = month(current_date()) -group by category,material_name -) as month on month.material_name=year.material_name and month.category=year.category +month(pm.CreatedDate) = month(current_date()) +group by category +) as month on month.category=year.category left join -(SELECT mm.Category as category,mm.MaterialCode as mid,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal +(SELECT mm.Category as category,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal FROM T_PurchaseOrder_Master pm left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -date(pm.PODate) = current_date() -group by category,material_name -) as today on today.material_name=month.material_name and today.category=month.category -group by category,material_name "; +date(pm.CreatedDate) = current_date() +group by category +) as today on today.category=month.category +group by category "; $query = $this->db->query($sql); return $query->result(); } - function rawi_report_cum_year($mat=null,$cat=null){ + function rawi_report_cum_year($cat=null){ $sql="SELECT mm.Category as category,sd.SupplierID as sid,mm.MaterialCode as mid,sd.SupplierName as supplier_name,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal FROM T_PurchaseOrder_Master pm @@ -1550,18 +1554,18 @@ left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and case - when (month(pm.PODate) >=4) then - (YEAR(pm.PODate) = YEAR(CURRENT_DATE) and MONTH(pm.PODate) >= 4 ) or ( YEAR(pm.PODate) = YEAR(CURRENT_DATE)+1 and MONTH(pm.PODate) <= 3 ) + when (month(pm.CreatedDate) >=4) then + (YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE) and MONTH(pm.CreatedDate) >= 4 ) or ( YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE)+1 and MONTH(pm.CreatedDate) <= 3 ) else - (YEAR(pm.PODate) = YEAR(CURRENT_DATE)-1 and MONTH(pm.PODate) >= 4 ) or ( YEAR(pm.PODate) = YEAR(CURRENT_DATE) and MONTH(pm.PODate) <= 3 ) + (YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE)-1 and MONTH(pm.CreatedDate) >= 4 ) or ( YEAR(pm.CreatedDate) = YEAR(CURRENT_DATE) and MONTH(pm.CreatedDate) <= 3 ) end - and mm.MaterialCode = '".$mat."' and mm.Category = '".$cat."' + and mm.Category = '".$cat."' group by supplier_name,material_name"; $query = $this->db->query($sql); //echo $sql; return $query->result(); } - function rawi_report_cum_month($mat=null,$cat=null){ + function rawi_report_cum_month($cat=null){ $sql="SELECT mm.Category as category,sd.SupplierID as sid,mm.MaterialCode as mid,sd.SupplierName as supplier_name,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal FROM T_PurchaseOrder_Master pm @@ -1569,12 +1573,12 @@ left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -month(pm.PODate) = month(current_date()) and mm.MaterialCode = '".$mat."' and mm.Category = '".$cat."' +month(pm.CreatedDate) = month(current_date()) and mm.Category = '".$cat."' group by supplier_name,material_name"; $query = $this->db->query($sql); return $query->result(); } - function rawi_report_cum_day($mat=null,$cat=null){ + function rawi_report_cum_day($cat=null){ $sql="SELECT mm.Category as category,sd.SupplierID as sid,mm.MaterialCode as mid,sd.SupplierName as supplier_name,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal FROM T_PurchaseOrder_Master pm @@ -1582,40 +1586,41 @@ left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -date(pm.PODate) = current_date() and mm.MaterialCode = '".$mat."'and mm.Category = '".$cat."' +date(pm.CreatedDate) = current_date() and mm.Category = '".$cat."' group by supplier_name,material_name"; $query = $this->db->query($sql); + echo $sql; return $query->result(); } function rawi_report_consolidate($cname,$fa,$aa){ - $sql="select mm.Category as category,mm.MaterialCode as mid,mm.MaterialName as material_name, -SUM(IF(month(pm.PODate) = 4, pl.Quantity, 0)) AS April, -SUM(IF(month(pm.PODate) = 5, pl.Quantity, 0)) AS May, -SUM(IF(month(pm.PODate) = 6, pl.Quantity, 0)) AS June, -SUM(IF(month(pm.PODate) = 7, pl.Quantity, 0)) AS July, -SUM(IF(month(pm.PODate) = 8, pl.Quantity, 0)) AS August, -SUM(IF(month(pm.PODate) = 9, pl.Quantity, 0)) AS September, -SUM(IF(month(pm.PODate) = 10, pl.Quantity, 0)) AS October, -SUM(IF(month(pm.PODate) = 11, pl.Quantity, 0)) AS November, -SUM(IF(month(pm.PODate) = 12, pl.Quantity, 0)) AS December, -SUM(IF(month(pm.PODate) = 1, pl.Quantity, 0)) AS January, -SUM(IF(month(pm.PODate) = 2, pl.Quantity, 0)) AS February, -SUM(IF(month(pm.PODate) = 3, pl.Quantity, 0)) AS March, + $sql="select mm.Category as category, +SUM(IF(month(pm.CreatedDate) = 4, pl.Quantity, 0)) AS April, +SUM(IF(month(pm.CreatedDate) = 5, pl.Quantity, 0)) AS May, +SUM(IF(month(pm.CreatedDate) = 6, pl.Quantity, 0)) AS June, +SUM(IF(month(pm.CreatedDate) = 7, pl.Quantity, 0)) AS July, +SUM(IF(month(pm.CreatedDate) = 8, pl.Quantity, 0)) AS August, +SUM(IF(month(pm.CreatedDate) = 9, pl.Quantity, 0)) AS September, +SUM(IF(month(pm.CreatedDate) = 10, pl.Quantity, 0)) AS October, +SUM(IF(month(pm.CreatedDate) = 11, pl.Quantity, 0)) AS November, +SUM(IF(month(pm.CreatedDate) = 12, pl.Quantity, 0)) AS December, +SUM(IF(month(pm.CreatedDate) = 1, pl.Quantity, 0)) AS January, +SUM(IF(month(pm.CreatedDate) = 2, pl.Quantity, 0)) AS February, +SUM(IF(month(pm.CreatedDate) = 3, pl.Quantity, 0)) AS March, sum(pl.Quantity) as qtotal, -SUM(IF(month(pm.PODate) = 4, pl.Quantity * pl.Rate, 0)) AS vApril, -SUM(IF(month(pm.PODate) = 5, pl.Quantity * pl.Rate, 0)) AS vMay, -SUM(IF(month(pm.PODate) = 6, pl.Quantity * pl.Rate, 0)) AS vJune, -SUM(IF(month(pm.PODate) = 7, pl.Quantity * pl.Rate, 0)) AS vJuly, -SUM(IF(month(pm.PODate) = 8, pl.Quantity * pl.Rate, 0)) AS vAugust, -SUM(IF(month(pm.PODate) = 9, pl.Quantity * pl.Rate, 0)) AS vSeptember, -SUM(IF(month(pm.PODate) = 10, pl.Quantity * pl.Rate, 0)) AS vOctober, -SUM(IF(month(pm.PODate) = 11, pl.Quantity * pl.Rate, 0)) AS vNovember, -SUM(IF(month(pm.PODate) = 12, pl.Quantity * pl.Rate, 0)) AS vDecember, -SUM(IF(month(pm.PODate) = 1, pl.Quantity * pl.Rate, 0)) AS vJanuary, -SUM(IF(month(pm.PODate) = 2, pl.Quantity * pl.Rate, 0)) AS vFebruary, -SUM(IF(month(pm.PODate) = 3, pl.Quantity * pl.Rate, 0)) AS vMarch, +SUM(IF(month(pm.CreatedDate) = 4, pl.Quantity * pl.Rate, 0)) AS vApril, +SUM(IF(month(pm.CreatedDate) = 5, pl.Quantity * pl.Rate, 0)) AS vMay, +SUM(IF(month(pm.CreatedDate) = 6, pl.Quantity * pl.Rate, 0)) AS vJune, +SUM(IF(month(pm.CreatedDate) = 7, pl.Quantity * pl.Rate, 0)) AS vJuly, +SUM(IF(month(pm.CreatedDate) = 8, pl.Quantity * pl.Rate, 0)) AS vAugust, +SUM(IF(month(pm.CreatedDate) = 9, pl.Quantity * pl.Rate, 0)) AS vSeptember, +SUM(IF(month(pm.CreatedDate) = 10, pl.Quantity * pl.Rate, 0)) AS vOctober, +SUM(IF(month(pm.CreatedDate) = 11, pl.Quantity * pl.Rate, 0)) AS vNovember, +SUM(IF(month(pm.CreatedDate) = 12, pl.Quantity * pl.Rate, 0)) AS vDecember, +SUM(IF(month(pm.CreatedDate) = 1, pl.Quantity * pl.Rate, 0)) AS vJanuary, +SUM(IF(month(pm.CreatedDate) = 2, pl.Quantity * pl.Rate, 0)) AS vFebruary, +SUM(IF(month(pm.CreatedDate) = 3, pl.Quantity * pl.Rate, 0)) AS vMarch, sum(pl.Quantity * pl.Rate) as vtotal FROM T_PurchaseOrder_Master pm join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO @@ -1625,7 +1630,7 @@ where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO f if ($cname!= ''){ - $sql.="and mm.MaterialName = '".$cname."'"; + $sql.="and mm.Category = '".$cname."'"; } @@ -1633,17 +1638,17 @@ if ($cname!= ''){ if ($fa and $aa != ''){ - $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + $sql.=" and (pm.CreatedDate >= '".$fa."-04-01' and pm.CreatedDate <= '".$aa."-03-31')"; } - $sql.= "group by category,material_name"; + $sql.= "group by category"; //echo $sql; $query = $this->db->query($sql); return $query->result(); } - function rawi_consolidate_month($m=null,$cat=null,$sup=null,$mat=null,$fa=null,$aa=null){ + function rawi_consolidate_month($m=null,$cat=null,$sup=null,$fa=null,$aa=null){ $sql="select mm.Category as category,sd.SupplierID as sid,sd.SupplierName as supplier_name,mm.MaterialCode as mid,mm.MaterialName as material_name, sum(pl.Quantity) as quantity, @@ -1653,10 +1658,10 @@ join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -monthname(pm.PODate) = '".$m."' and mm.Category = '".$cat."' and mm.MaterialCode = '".$mat."' "; +monthname(pm.CreatedDate) = '".$m."' and mm.Category = '".$cat."' "; if ($fa and $aa != ''){ - $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + $sql.=" and (pm.CreatedDate >= '".$fa."-04-01' and pm.CreatedDate <= '".$aa."-03-31')"; } $sql.= "group by category,supplier_name,material_name"; @@ -1664,7 +1669,7 @@ if ($fa and $aa != ''){ //echo $sql; return $query->result(); } - function rawi_consolidate_year($cat=null,$sup=null,$mat=null,$fa=null,$aa=null){ + function rawi_consolidate_year($cat=null,$sup=null,$fa=null,$aa=null){ $sql="select mm.Category as category,sd.SupplierID as sid,sd.SupplierName as supplier_name,mm.MaterialCode as mid,mm.MaterialName as material_name, sum(pl.Quantity) as quantity, @@ -1674,10 +1679,10 @@ join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and -mm.Category = '".$cat."' and mm.MaterialCode = '".$mat."' "; +mm.Category = '".$cat."' "; if ($fa and $aa != ''){ - $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + $sql.=" and (pm.CreatedDate >= '".$fa."-04-01' and pm.CreatedDate <= '".$aa."-03-31')"; } $sql.= "group by category,supplier_name,material_name"; diff --git a/application/views/Report_consolidate_month.php b/application/views/Report_consolidate_month.php index d50c4107..3fb6801c 100644 --- a/application/views/Report_consolidate_month.php +++ b/application/views/Report_consolidate_month.php @@ -76,9 +76,10 @@ if(!empty($mms)) ?> - category;?> + category;?> - supplier_name;?> + + supplier_name;?> material_name;?>