diff --git a/application/controllers/report.php b/application/controllers/report.php index ea80e54f..0651a3e1 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -39,9 +39,6 @@ class report extends BaseController $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['pending_list']=$this->dahsboard_Model->req_list($fa,$aa,$m,$frm,$t,$agf,$agt); //print_r($data); - - - } $data['finyear']=$this->dahsboard_Model->report_finyear(); @@ -260,7 +257,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); $ab=$this->input->post('financialyear'); @@ -274,7 +271,10 @@ class report extends BaseController $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['purchase']=$this->dahsboard_Model->report_purchase($cname,$prod,$fa,$aa,$m,$frm,$t); - + } + $data['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { $this->loadviews("Report_purchase",$this->global,$data, NULL); @@ -426,7 +426,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -439,6 +439,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_supplier($cname,$fa,$aa,$m,$frm,$t); + } + $data['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { @@ -456,7 +460,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -466,7 +470,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['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { @@ -549,7 +556,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); $ab=$this->input->post('financialyear'); @@ -564,7 +571,10 @@ class report extends BaseController $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat); - + } + $data['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { $this->loadviews("Report_purchase_inward",$this->global,$data, NULL); @@ -688,7 +698,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -701,7 +711,10 @@ class report extends BaseController $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['spurchse']=$this->dahsboard_Model->ireport_supplier($cname,$fa,$aa,$m,$frm,$t); - + } + $data['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { @@ -722,7 +735,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -732,7 +745,10 @@ class report extends BaseController $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); $data['spurchse']=$this->dahsboard_Model->ireport_consolidate($cname,$fa,$aa); - + } + $data['material']=$this->dahsboard_Model->material_name(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { $this->loadviews("Report_consolidate_inward",$this->global,$data, NULL); @@ -742,6 +758,61 @@ class report extends BaseController $this->loadViews("access", $this->global, $data, NULL); } + } + public function i_consolidate_month() + { + + $this->global['pageTitle'] = 'Siddharth : Reports'; + //$this->input->post('btn_submit'); + $sid=$this->input->get('sid'); + $mid = $this->input->get('mid'); + //$mat = $this->input->get('mid'); + $m = $this->input->get('m'); + $ab=$this->input->get('ab'); + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + //print_r($prod); + $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->i_consolidate_month($m,$sid,$mid,$fa,$aa); + // print_r( $data['spurchse']); + if($this->DEPCode == MANAGEMENT) + { + $this->loadviews("Report_consolidate_month_inward",$this->global,$data, NULL); + } + else + { + $this->loadViews("access", $this->global, $data, NULL); + } + + } + public function i_consolidate_year() + { + + $this->global['pageTitle'] = 'Siddharth : Reports'; + //$this->input->post('btn_submit'); + $sid=$this->input->get('sid'); + $mid = $this->input->get('mid'); + //$mat = $this->input->get('mid'); + $ab=$this->input->get('ab'); + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + //print_r($prod); + $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->i_consolidate_year($sid,$mid,$fa,$aa); + // print_r( $data['spurchse']); + if($this->DEPCode == MANAGEMENT) + { + $this->loadviews("Report_consolidate_year_inward",$this->global,$data, NULL); + } + else + { + $this->loadViews("access", $this->global, $data, NULL); + } + } public function icumulative() { @@ -869,7 +940,7 @@ class report extends BaseController { $this->global['pageTitle'] = 'Siddharth : Reports'; - //$this->input->post('btn_submit'); + if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); $fa=substr($ab,0,-5); @@ -879,7 +950,10 @@ class report extends BaseController $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); - + } + $data['material']=$this->dahsboard_Model->category(); + $data['cust']=$this->dahsboard_Model->customer_name(); + $data['finyear']=$this->dahsboard_Model->report_finyear(); if($this->DEPCode == MANAGEMENT) { $this->loadviews("Report_consolidate_raw",$this->global,$data, NULL); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 78966dc7..58f26060 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -160,7 +160,13 @@ $sql= "select * FROM T_Emp_Pay_Data where EmpID = ?;"; function totalpurchaseorder(){ - $sql="select count(PONO) as totalpurchaseorder from T_PurchaseOrder_Master where Status != 'ST030'"; + $sql="select count(PONO) as totalpurchaseorder from T_PurchaseOrder_Master pm where Status != 'ST030' + 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 ) + 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 ) + end"; $query = $this->db->query($sql); return $query->result(); @@ -168,7 +174,13 @@ $sql= "select * FROM T_Emp_Pay_Data where EmpID = ?;"; function totalordervalue(){ - $sql="select sum(totalordervalue) as totalordervalue from T_PurchaseOrder_Master where Status != 'ST030'"; + $sql="select sum(totalordervalue) as totalordervalue from T_PurchaseOrder_Master pm where Status != 'ST030' + 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 ) + 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 ) + end"; $query = $this->db->query($sql); return $query->result(); @@ -176,7 +188,13 @@ $sql= "select * FROM T_Emp_Pay_Data where EmpID = ?;"; function pendingpo(){ - $sql="select count(PONO) as pending from T_PurchaseOrder_Master where status='ST020' and Status != 'ST030'"; + $sql="select count(PONO) as pending from T_PurchaseOrder_Master pm where status='ST020' and Status != 'ST030' + 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 ) + 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 ) + end"; $query = $this->db->query($sql); return $query->result(); @@ -184,7 +202,13 @@ $sql= "select * FROM T_Emp_Pay_Data where EmpID = ?;"; function req_pending(){ - $sql="SELECT count(Status) as TOTAL_PENDING_REQUESTS FROM T_Requestion_Master where Status = 'ST002';"; + $sql="SELECT count(Status) as TOTAL_PENDING_REQUESTS FROM T_Requestion_Master pm where Status = 'ST002' + and case + when (month(pm.ReqDate) >=4) then + (YEAR(pm.ReqDate) = YEAR(CURRENT_DATE) and MONTH(pm.ReqDate) >= 4 ) or ( YEAR(pm.ReqDate) = YEAR(CURRENT_DATE)+1 and MONTH(pm.ReqDate) <= 3 ) + else + (YEAR(pm.ReqDate) = YEAR(CURRENT_DATE)-1 and MONTH(pm.ReqDate) >= 4 ) or ( YEAR(pm.ReqDate) = YEAR(CURRENT_DATE) and MONTH(pm.ReqDate) <= 3 ) + end"; $query = $this->db->query($sql); return $query->result(); @@ -1249,7 +1273,7 @@ left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo -where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) "; +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) "; if ($cname!= ''){ @@ -1328,7 +1352,7 @@ left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo where -pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) "; +pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) "; if ($cname!= ''){ @@ -1400,7 +1424,7 @@ 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 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo -where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) group by month(created_date)"; $query = $this->db->query($sql); return $query->result(); @@ -1419,7 +1443,7 @@ 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 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo -where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and sd.SupplierName is not null and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate)= ? and year(pm.PODate) = ? +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and sd.SupplierName is not null and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate)= ? and year(pm.PODate) = ? group by supplier_name,material_name"; $query = $this->db->query($sql,array($month,$year)); return $query->result(); @@ -1432,7 +1456,7 @@ 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 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo -where pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) and sd.SupplierName is not null and date(pm.PODate) >= '$a-04-01' and date(pm.PODate) <= '$b-03-31' +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and sd.SupplierName is not null and date(pm.PODate) >= '$a-04-01' and date(pm.PODate) <= '$b-03-31' group by supplier_name,material_name"; $query = $this->db->query($sql,array()); return $query->result(); @@ -1482,7 +1506,7 @@ left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo where -pm.Status != 'ST030' and pm.Status = 'ST056' and pm.PONO in (select PONO from T_IGR_Master) "; +pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) "; if ($cname!= ''){ @@ -1551,7 +1575,7 @@ FROM T_PurchaseOrder_Master pm 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) "; +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) "; if ($cname!= ''){ @@ -1573,6 +1597,48 @@ if ($cname!= ''){ return $query->result(); } + function i_consolidate_month($m=null,$sid=null,$mid=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, +sum(pl.Quantity * pl.Rate) as total +FROM T_PurchaseOrder_Master pm +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.PONO in (select PONO from T_IGR_Master) and +monthname(pm.PODate) = '".$m."' and sd.SupplierID = '".$sid."' and mm.MaterialCode = '".$mid."' "; +if ($fa and $aa != ''){ + + $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + + } + $sql.= "group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } + function i_consolidate_year($sid=null,$mid=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, +sum(pl.Quantity * pl.Rate) as total +FROM T_PurchaseOrder_Master pm +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.PONO in (select PONO from T_IGR_Master) and +sd.SupplierID = '".$sid."' and mm.MaterialCode = '".$mid."' "; +if ($fa and $aa != ''){ + + $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + + } + $sql.= "group by supplier_name,material_name"; + $query = $this->db->query($sql); + //echo $sql; + return $query->result(); + } function ireport_cumulative(){ $sql="SELECT year.sid as sid,year.mid as mid,year.supplier_name as supplier_name,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 @@ -1581,7 +1647,7 @@ 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 +where pm.Status != 'ST030' 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 ) @@ -1595,7 +1661,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate) = month(current_date()) group by supplier_name,material_name ) as month on month.supplier_name=year.supplier_name and month.material_name=year.material_name @@ -1605,7 +1671,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and date(pm.PODate) = current_date() group by supplier_name,material_name ) as today on today.supplier_name=month.supplier_name and today.material_name=month.material_name @@ -1621,7 +1687,7 @@ 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()) and sd.SupplierID = '".$sup."' and mm.MaterialCode = '".$mat."' +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate) = month(current_date()) and sd.SupplierID = '".$sup."' and mm.MaterialCode = '".$mat."' group by supplier_name,material_name"; $query = $this->db->query($sql); return $query->result(); @@ -1633,7 +1699,7 @@ 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 +where pm.Status != 'ST030' 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 ) @@ -1652,7 +1718,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and date(pm.PODate) = current_date() and sd.SupplierID = '".$sup."' and mm.MaterialCode = '".$mat."' group by supplier_name,material_name"; $query = $this->db->query($sql); @@ -1666,7 +1732,7 @@ 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 +where pm.Status != 'ST030' 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 ) @@ -1680,7 +1746,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate) = month(current_date()) group by category ) as month on month.category=year.category @@ -1690,7 +1756,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and date(pm.PODate) = current_date() group by category ) as today on today.category=month.category @@ -1705,7 +1771,7 @@ 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 +where pm.Status != 'ST030' 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 ) @@ -1725,7 +1791,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and month(pm.PODate) = month(current_date()) and mm.Category = '".$cat."' group by supplier_name,material_name"; $query = $this->db->query($sql); @@ -1738,7 +1804,7 @@ 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and date(pm.PODate) = current_date() and mm.Category = '".$cat."' group by supplier_name,material_name"; $query = $this->db->query($sql); @@ -1779,7 +1845,7 @@ FROM T_PurchaseOrder_Master pm 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) "; +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) "; if ($cname!= ''){ @@ -1810,7 +1876,7 @@ FROM T_PurchaseOrder_Master pm 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and monthname(pm.PODate) = '".$m."' and mm.Category = '".$cat."' "; if ($fa and $aa != ''){ @@ -1831,7 +1897,7 @@ FROM T_PurchaseOrder_Master pm 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 +where pm.Status != 'ST030' and pm.PONO in (select PONO from T_IGR_Master) and mm.Category = '".$cat."' "; if ($fa and $aa != ''){ diff --git a/application/views/Report_consolidate.php b/application/views/Report_consolidate.php index 3a24d953..c9794025 100755 --- a/application/views/Report_consolidate.php +++ b/application/views/Report_consolidate.php @@ -154,6 +154,7 @@ + @@ -401,6 +407,7 @@ - supplier_name)) { echo $result->supplier_name; } else {echo "-";} - ?> + supplier_name;?> material_name)) { echo $result->material_name ; } else {echo "-";} ?> @@ -617,6 +622,12 @@ + diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php index be7af89a..edd92a37 100644 --- a/application/views/Report_consolidate_inward.php +++ b/application/views/Report_consolidate_inward.php @@ -151,7 +151,8 @@ - April); - if(!empty($result->April)) { echo round($result->April); } else {echo "-";} - ?> + ?> + April);?> + May); - if(!empty($result->May)) { echo round($result->May); } else {echo "-";} - ?> + ?> + May);?> + June); - if(!empty($result->June)) { echo round($result->June); } else {echo "-";} - ?> + ?> + June);?> + July); - if(!empty($result->July)) { echo round($result->July); } else {echo "-";} - ?> + ?> + July);?> + August); - if(!empty($result->August)) { echo round($result->August); } else {echo "-";} - - ?> + ?> + August);?> + September; - if(!empty($result->September)) { echo round($result->September); } else {echo "-";} - ?> + ?> + September);?> + October); - if(!empty($result->October)) { echo round($result->October); } else {echo "-";} - ?> + ?> + October);?> + November); - if(!empty($result->November)) { echo round($result->November); } else {echo "-";} - ?> + ?> + November);?> + December); - if(!empty($result->December)) { echo round($result->December); } else {echo "-";} - ?> + ?> + December);?> + January); - if(!empty($result->January)) { echo round($result->January); } else {echo "-";} - ?> + ?> + January);?> + February); - if(!empty($result->February)) { echo round($result->February); } else {echo "-";} - ?> + ?> + February);?> + March); - if(!empty($result->March)) { echo round($result->March); } else {echo "-";} - ?> + ?> + March);?> + qtotal); - if(!empty($result->qtotal)) { echo round($result->qtotal); } else {echo "-";} - ?> + ?> + qtotal);?> + + diff --git a/application/views/Report_consolidate_month_inward.php b/application/views/Report_consolidate_month_inward.php new file mode 100644 index 00000000..5fd43d10 --- /dev/null +++ b/application/views/Report_consolidate_month_inward.php @@ -0,0 +1,199 @@ + + + + + + +
+ +
+ +
+
+

Report - Consolidate-Inward(input->get('m'); + echo $m; + ?>)

+
+ + +
+
+ + + + + + + + + + + + + + + + input->get('ab'); + $month=date('F'); + $m = $this->input->get('m'); + //echo $month; + foreach($spurchse as $rel) + { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  ()
+ supplier_name;?> + material_name;?>quantity); + echo round($rel->quantity);?>total,2,'.',''); + echo number_format($rel->total,2,'.','');?>
Total + + + + + + + + + + +
+ +
+
+
+ +
+ +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/Report_consolidate_raw.php b/application/views/Report_consolidate_raw.php index af798d9d..ee9f6add 100644 --- a/application/views/Report_consolidate_raw.php +++ b/application/views/Report_consolidate_raw.php @@ -151,6 +151,7 @@ + diff --git a/application/views/Report_consolidate_year_inward.php b/application/views/Report_consolidate_year_inward.php new file mode 100644 index 00000000..98cb471c --- /dev/null +++ b/application/views/Report_consolidate_year_inward.php @@ -0,0 +1,201 @@ + + + + + + +
+ +
+ +
+
+

Report - Consolidate-Inwardinput->get('ab')){ + $ab = $this->input->get('ab'); + echo '('.$ab.')'; + } + ?>

+
+ + +
+
+ + + + + + + + + + + + + + + + input->get('ab'); + $month=date('F'); + $m = $this->input->get('m'); + //echo $month; + foreach($spurchse as $rel) + { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  ()
+ supplier_name;?> + material_name;?>quantity); + echo round($rel->quantity);?>total,2,'.',''); + echo number_format($rel->total,2,'.','');?>
Total + + + + + + + + + + +
+ +
+
+
+ +
+ +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php index 684a5926..9ed6685b 100755 --- a/application/views/Report_purchase.php +++ b/application/views/Report_purchase.php @@ -75,7 +75,7 @@ if(!empty($mms)) if($this->input->post('from_date') && $this->input->post('to_date')){ $frm = $this->input->post('from_date'); $t = $this->input->post('to_date'); - echo $frm.'to'.$t; + echo $frm.'-to-'.$t; } ?> @@ -216,7 +216,7 @@ if(!empty($mms))
- +
diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php index ee5e7b42..2154a07a 100644 --- a/application/views/Report_purchase_inward.php +++ b/application/views/Report_purchase_inward.php @@ -74,7 +74,7 @@ if(!empty($mms)) if($this->input->post('from_date') && $this->input->post('to_date')){ $frm = $this->input->post('from_date'); $t = $this->input->post('to_date'); - echo $frm.'to'.$t; + echo $frm.'-to-'.$t; } ?>

@@ -213,7 +213,7 @@ if(!empty($mms))
-
PO NO
+
diff --git a/application/views/Report_totalorders.php b/application/views/Report_totalorders.php index 06fca0c0..81dfa87a 100755 --- a/application/views/Report_totalorders.php +++ b/application/views/Report_totalorders.php @@ -25,6 +25,10 @@ if(!empty($Total)) float: right; } + .btn-success { + background-color: #3c8dbc; + border-color: #3c8dbc; + }
PO NO