diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index 5b50bf1b..6cd325b1 100644 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -320,7 +320,25 @@ class amendmentpurchaseorder extends BaseController $APO=$this->purchaseorder_model->updateAmendPOMaster($PONO,$PODetail); $LineItemStatus = REQITEM_NEW; - + + $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); + + $po = ''; + $igrno =''; + + foreach ($igrvalue as $value) { + + $igrno = $value->IGRNO; + $po =$value->PONO; + if($PONO == $po) + { + $NewPOno = array('PONO' =>$NewPO); + $this->purchaseorder_model->updateigrmaster($igrno,$NewPOno); + } + + + } + for ($i = 1; $i <= $RowCount; $i++) { @@ -511,7 +529,24 @@ class amendmentpurchaseorder extends BaseController $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); - } + } + $ordqty =''; + $recqty =''; + + $qty = $this->purchaseorder_model->getpolineqty($NewPO); + + $ordqty = $qty[0]->Qty; + $recqty = $qty[0]->rec; + + if($ordqty == $recqty) + { + + $Newstatus = array('Status'=>IGR_CREATED); + $this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus); + $Newstat = array('Status'=>IGR_CREATED); + $this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat); + + } echo 'Purchase Order Amended Successfully! PO Number Is: '.$PONO .'- New PO Number is'.$NewPO; } @@ -853,7 +888,25 @@ class amendmentpurchaseorder extends BaseController $LineItemStatus = REQITEM_NEW; - + + $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); + + $po = ''; + $igrno =''; + + foreach ($igrvalue as $value) { + + $igrno = $value->IGRNO; + $po =$value->PONO; + if($PONO == $po) + { + $NewPOno = array('PONO' =>$NewPO); + $this->purchaseorder_model->updateigrmaster($igrno,$NewPOno); + } + + + } + for ($i = 1; $i <= $RowCount; $i++) { @@ -1076,6 +1129,24 @@ class amendmentpurchaseorder extends BaseController } + $ordqty =''; + $recqty =''; + + $qty = $this->purchaseorder_model->getpolineqty($NewPO); + + $ordqty = $qty[0]->Qty; + $recqty = $qty[0]->rec; + + if($ordqty == $recqty) + { + + $Newstatus = array('Status'=>IGR_CREATED); + $this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus); + $Newstat = array('Status'=>IGR_CREATED); + $this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat); + + } + echo 'Purchase Order'.$PONO.'Amended Successfully! New PO Number Is: '.$NewPO ; } @@ -1201,6 +1272,24 @@ class amendmentpurchaseorder extends BaseController $LineItemStatus = REQITEM_NEW; + $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); + + $po = ''; + $igrno =''; + + foreach ($igrvalue as $value) { + + $igrno = $value->IGRNO; + $po =$value->PONO; + if($PONO == $po) + { + $NewPOno = array('PONO' =>$NewPO); + $this->purchaseorder_model->updateigrmaster($igrno,$NewPOno); + } + + + } + for ($i = 1; $i <= $RowCount; $i++) { $CAD=''; @@ -1403,6 +1492,24 @@ class amendmentpurchaseorder extends BaseController } + $ordqty =''; + $recqty =''; + + $qty = $this->purchaseorder_model->getpolineqty($NewPO); + + $ordqty = $qty[0]->Qty; + $recqty = $qty[0]->rec; + + if($ordqty == $recqty) + { + + $Newstatus = array('Status'=>IGR_CREATED); + $this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus); + $Newstat = array('Status'=>IGR_CREATED); + $this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat); + + } + echo 'Purchase Order is'.$PONO.'Amended Successfully! New PO Number is: '.$NewPO ; } diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index 5606b952..64151771 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -86,6 +86,7 @@ class batchcard extends BaseController { $data['MaterialCode'] = $this->batchcard_model->getMaterial(); $data['Supplier'] = $this->batchcard_model->getSupplierlist(); + $data['stock_value'] = $this->batchcard_model->getStockValue(); $this->global['pageTitle'] = $this->CompanyName.' : Material Adjustment'; $this->loadViews("materialadjustment", $this->global,$data,NULL); } diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 666c53c1..70d30d22 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -77,6 +77,23 @@ class inwardgateregister extends BaseController { $PO = $this->input->post('id'); $CreatedBy = $this->session->userdata('userId'); + + $ordqty =''; + $recqty =''; + + $qty = $this->inwardgateregister_model->getpolineqty($PO); + + $ordqty = $qty[0]->Qty; + $recqty = $qty[0]->rec; + + if($ordqty == $recqty) + { + $Newstatus = array('Status'=>IGR_CREATED); + $this->inwardgateregister_model-> POLineItemsupdatestatus($PO,$Newstatus); + $Newstat = array('Status'=>IGR_CREATED); + $this->inwardgateregister_model->pomasterupdatestatus($PO,$Newstat); + } + $this->inwardgateregister_model->UpdatePOMaster($PO,$CreatedBy); $data = $this->inwardgateregister_model->viewpurchaseorder($PO); echo json_encode($data); diff --git a/application/controllers/report.php b/application/controllers/report.php index 3ac81043..a5d97a5d 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -1219,51 +1219,51 @@ class report extends BaseController } /** GST Monthly-report */ - public function monthly_gst() - { - - $this->global['pageTitle'] = $this->CompanyName.' : GST Monthly-Reports'; - if ($this->input->post('btn_submit')) { - - $m=$this->input->post('month'); - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - $ab=$this->input->post('financialyear'); - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - //print_r($prod); - - $data['monthly_gst_purchase']=$this->dahsboard_Model->monthly_gst_purchase($m,$frm,$t,$fa,$aa); - $data['monthly_gst_sales']=$this->dahsboard_Model->monthly_gst_sales($m,$frm,$t,$fa,$aa); - + public function monthly_gst() + { + + $this->global['pageTitle'] = $this->CompanyName.' : GST Monthly-Reports'; + if ($this->input->post('btn_submit')) { + + $m=$this->input->post('month'); + $frm = $this->input->post('from_date'); + $t = $this->input->post('to_date'); + $ab=$this->input->post('financialyear'); + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + //print_r($prod); + + $data['monthly_gst_purchase']=$this->dahsboard_Model->monthly_gst_purchase($m,$frm,$t,$fa,$aa); + $data['monthly_gst_sales']=$this->dahsboard_Model->monthly_gst_sales($m,$frm,$t,$fa,$aa); + + } + $data['finyear']=$this->dahsboard_Model->report_finyear(); + $this->loadviews("Report_monthly_gst",$this->global,$data, NULL); + //print_r($data);die(); } - $data['finyear']=$this->dahsboard_Model->report_finyear(); - $this->loadviews("Report_monthly_gst",$this->global,$data, NULL); - //print_r($data);die(); - } - public function monthly_gst_table() - { - - $this->global['pageTitle'] = $this->CompanyName.' : GST Monthly-Reports'; - + public function monthly_gst_table() + { + + $this->global['pageTitle'] = $this->CompanyName.' : GST Monthly-Reports'; - $m=$this->input->get('m'); - $frm = $this->input->get('frm'); - $t = $this->input->get('t'); - $ab=$this->input->get('financialyear'); - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - // print_r($frm); - // print_r($t); - // print_r($m);die(); - - $data['monthly_gst_purchase']=$this->dahsboard_Model->purchase_gst($m,$frm,$t,$fa,$aa); - $data['monthly_gst_sales']=$this->dahsboard_Model->sales_gst($m,$frm,$t,$fa,$aa); - - - $this->loadviews("Report_monthly_gst_table",$this->global,$data, NULL); - //print_r($data);die(); - } + + $m=$this->input->get('m'); + $frm = $this->input->get('frm'); + $t = $this->input->get('t'); + $ab=$this->input->get('financialyear'); + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + // print_r($frm); + // print_r($t); + // print_r($m);die(); + + $data['monthly_gst_purchase']=$this->dahsboard_Model->purchase_gst($m,$frm,$t,$fa,$aa); + $data['monthly_gst_sales']=$this->dahsboard_Model->sales_gst($m,$frm,$t,$fa,$aa); + + + $this->loadviews("Report_monthly_gst_table",$this->global,$data, NULL); + //print_r($data);die(); + } function Viewfiles() { diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index 2b1aa8bc..2b18c524 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -18,6 +18,16 @@ class batchcard_model extends CI_Model $supp = $this->db->get(); return $supp->result(); + } + + function getStockValue() + { + + $this->db->select('MaterialCode,stock'); + $this->db->from('T_MaterialMaster'); + $supp = $this->db->get(); + return $supp->result(); + } /* diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 3efa6ed2..2af8b08f 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2764,236 +2764,230 @@ function INRSymbol() } /** GST monthly-Report queries */ - function monthly_gst_purchase($m,$frm,$t,$fa,$aa){ +function monthly_gst_purchase($m,$frm,$t,$fa,$aa){ - $sql="select g.doc_no,g.date,g.doc_type,g.hsn_code,sum(g.value) as value,sum(g.others) as others,sum(g.sgst) as sgst,sum(g.cgst) as cgst,sum(g.igst) as igst,sum(g.total) as total from - (SELECT pm.PONO as doc_no,date_format(pm.PODate,'%d-%m-%Y') as date, - 'Purchase' as doc_type,mm.HSNCODE as hsn_code, - mm.MaterialName as material_name,sd.SupplierName as supplier_name, - round(ifnull(sum(distinct pl.Quantity * pl.Rate),0),2) as value, - if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst, - (ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) - +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) - +ifnull(rt.Insurance,0) - -ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)) as others, - round(( - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0)) - ,2) as total - FROM T_PurchaseOrder_Master pm - 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 - left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo - where - pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' - group by doc_no,material_name,supplier_name) as g - left join T_PurchaseOrder_Master p on p.PONO = g.doc_no - where g.doc_no != 'null' "; - - if ($m!= ''){ - - $sql.="and monthname(p.PODate) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromd= date("Y-m-d",strtotime($frm)); - $tod=date("Y-m-d",strtotime($t)); - - $sql.="and p.PODate >= '".$fromd."' - and p.PODate <= '".$tod."'"; - - } - if ($fa and $aa != ''){ - - $sql.=" and (p.PODate >= '".$fa."-04-01' and p.PODate <= '".$aa."-03-31')"; - - } - - - //echo $sql; - $query = $this->db->query($sql); - return $query->result(); - } - public function monthly_gst_sales($m=null,$frm=null,$t=null,$fa=null,$aa=null) - { - - $sql = "select ii.invoice_id as invoice_id,ii.invoice_number as invoice_number,date_format(ii.invoice_date_created,'%d-%m-%Y') as dates, - sum(ifnull(((sgst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100),0)) - as sgst, - sum(ifnull(((iit.item_quantity * iit.item_price) * cgst.tax_rate_percent)/100,0)) - as cgst, - sum(ifnull((igst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100,0)) - as igst, - sum((ifnull(((sgst.tax_rate_percent * iia.item_subtotal)/100),0) - + - ifnull(((iia.item_subtotal * cgst.tax_rate_percent)/100),0) - + - ifnull(((igst.tax_rate_percent * iia.item_subtotal)/100),0))) - as total - from ip_invoices ii - join ip_invoice_custom icf on icf.invoice_id = ii.invoice_id - join ip_invoice_items iit on iit.invoice_id = ii.invoice_id - join ip_invoice_item_amounts iia on iia.item_id = iit.item_id - join ip_clients ic on ic.client_id = ii.client_id - join ip_products ip on ip.product_id = iit.item_product_id - left join ip_tax_rates sgst on sgst.tax_rate_id = iit.sgst_item_tax_rate_id - left join ip_tax_rates cgst on cgst.tax_rate_id = iit.cgst_item_tax_rate_id - left join ip_tax_rates igst on igst.tax_rate_id = iit.igst_item_tax_rate_id - where icf.invoice_custom_fieldid = '8' and ii.invoice_status_id != 1 "; - - - - - if ($m!= ''){ - - $sql.="and monthname(ii.invoice_date_created) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromdate= date("Y-m-d",strtotime($frm)); - $todate=date("Y-m-d",strtotime($t)); - - $sql.="and ii.invoice_date_created >= '".$fromdate."' - and ii.invoice_date_created <= '".$todate."'"; - - } - if ($fa and $aa != ''){ - - $sql.=" and (ii.invoice_date_created >= '".$fa."-04-01' and ii.invoice_date_created <= '".$aa."-03-31')"; - - } - //echo $sql; - $query = $this->db->query($sql); - return $query->result(); - - - } - function sales_gst($m=null,$frm=null,$t=null,$fa=null,$aa=null) - { - - $sql = "select ii.invoice_id as invoice_id,ii.client_id as client_id,ip.product_sku as hsn_code,ii.invoice_number as doc_no,date_format(ii.invoice_date_created,'%d-%m-%Y') as date,'Sales' as doc_type,TIME_FORMAT(ii.invoice_time_created,'%l:%i %p') as invoice_time_created,icf.invoice_custom_fieldvalue as vehicle_no,ip.product_description as product_description,concat(ic.client_name,'-',ic.client_surname)as client_name,sum(iit.item_quantity) as item_quantity,sum(iit.item_price) as item_price,sum(iia.item_subtotal) as value, - sum(ifnull(((sgst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100),0)) - as sgst, - sum(ifnull(((iit.item_quantity * iit.item_price) * cgst.tax_rate_percent)/100,0)) - as cgst, - sum(ifnull((igst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100,0)) - as igst, - round(sum((iia.item_subtotal + ifnull(((sgst.tax_rate_percent * iia.item_subtotal)/100),0) - + - ifnull(((iia.item_subtotal * cgst.tax_rate_percent)/100),0) - + - ifnull(((igst.tax_rate_percent * iia.item_subtotal)/100),0))),2) - as total - from ip_invoices ii - join ip_invoice_custom icf on icf.invoice_id = ii.invoice_id - join ip_invoice_items iit on iit.invoice_id = ii.invoice_id - join ip_invoice_item_amounts iia on iia.item_id = iit.item_id - join ip_clients ic on ic.client_id = ii.client_id - join ip_products ip on ip.product_id = iit.item_product_id - left join ip_tax_rates sgst on sgst.tax_rate_id = iit.sgst_item_tax_rate_id - left join ip_tax_rates cgst on cgst.tax_rate_id = iit.cgst_item_tax_rate_id - left join ip_tax_rates igst on igst.tax_rate_id = iit.igst_item_tax_rate_id - where icf.invoice_custom_fieldid = '8' and ii.invoice_status_id != 1 "; - - - - if ($m!= ''){ - - $sql.="and monthname(ii.invoice_date_created) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromdate= date("Y-m-d",strtotime($frm)); - $todate=date("Y-m-d",strtotime($t)); - - $sql.="and ii.invoice_date_created >= '".$fromdate."' - and ii.invoice_date_created <= '".$todate."'"; - - } - if ($fa and $aa != ''){ - - $sql.=" and (ii.invoice_date_created >= '".$fa."-04-01' and ii.invoice_date_created <= '".$aa."-03-31')"; - - } - - $sql.="group by doc_no,product_description"; - $query = $this->db->query($sql); - return $query->result(); - - - } - function purchase_gst($m,$frm,$t,$fa,$aa){ - - - $sql="SELECT pm.PONO as doc_no,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as date, - TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,'Purchase' as doc_type,mm.HSNCODE as hsn_code, - mm.MaterialName as material_name,sd.SupplierName as supplier_name, - ifnull(sum(distinct pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(distinct pl.Rate),0) as rate, - round(ifnull(sum(distinct pl.Quantity * pl.Rate),0),2) as value, - if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst, - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst, - (ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) - +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) - +ifnull(rt.Insurance,0) - -ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)) as others, - round(( - if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)), - if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)), - ifnull(sum(pl.Quantity * pl.Rate),0))) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) - + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) - + ifnull(rt.Insurance,0) - - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total - FROM T_PurchaseOrder_Master pm - 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 - left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo - where - pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' "; - - - if ($m!= ''){ - - $sql.="and monthname(pm.PODate) = '".$m."'"; - - } - - if ($frm and $t != ''){ - $fromd= date("Y-m-d",strtotime($frm)); - $tod=date("Y-m-d",strtotime($t)); - - $sql.="and date(pm.PODate) >= '".$fromd."' - and date(pm.PODate) <= '".$tod."'"; - - } - if ($fa and $aa != ''){ - - $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; - - } - - - $sql.="group by doc_no,material_name,supplier_name"; - - $query = $this->db->query($sql); - return $query->result(); - } + $sql="select g.doc_no,g.date,g.doc_type,g.hsn_code,sum(g.value) as value,sum(g.others) as others,sum(g.sgst) as sgst,sum(g.cgst) as cgst,sum(g.igst) as igst,sum(g.total) as total from +(SELECT pm.PONO as doc_no,date_format(pm.PODate,'%d-%m-%Y') as date, +'Purchase' as doc_type,mm.HSNCODE as hsn_code, +mm.MaterialName as material_name,sd.SupplierName as supplier_name, +round(ifnull(sum(distinct pl.Quantity * pl.Rate),0),2) as value, +if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst, +(ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) ++ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) ++ifnull(rt.Insurance,0) +-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)) as others, +round(( +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0)) +,2) as total +FROM T_PurchaseOrder_Master pm +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 +left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo +where +pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' +group by doc_no,material_name,supplier_name) as g +left join T_PurchaseOrder_Master p on p.PONO = g.doc_no +where g.doc_no != 'null' "; + + if ($m!= ''){ + $sql.="and monthname(p.PODate) = '".$m."'"; + + } + + if ($frm and $t != ''){ + $fromd= date("Y-m-d",strtotime($frm)); + $tod=date("Y-m-d",strtotime($t)); + + $sql.="and p.PODate >= '".$fromd."' + and p.PODate <= '".$tod."'"; + + } +if ($fa and $aa != ''){ + + $sql.=" and (p.PODate >= '".$fa."-04-01' and p.PODate <= '".$aa."-03-31')"; + + } + + + //echo $sql; + $query = $this->db->query($sql); + return $query->result(); +} +public function monthly_gst_sales($m=null,$frm=null,$t=null,$fa=null,$aa=null) +{ + +$sql = "select ii.invoice_id as invoice_id,ii.invoice_number as invoice_number,date_format(ii.invoice_date_created,'%d-%m-%Y') as dates, + sum(ifnull(((sgst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100),0)) + as sgst, + sum(ifnull(((iit.item_quantity * iit.item_price) * cgst.tax_rate_percent)/100,0)) + as cgst, + sum(ifnull((igst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100,0)) + as igst, + sum((ifnull(((sgst.tax_rate_percent * iia.item_subtotal)/100),0) + + + ifnull(((iia.item_subtotal * cgst.tax_rate_percent)/100),0) + + + ifnull(((igst.tax_rate_percent * iia.item_subtotal)/100),0))) + as total + from ip_invoices ii + join ip_invoice_custom icf on icf.invoice_id = ii.invoice_id + join ip_invoice_items iit on iit.invoice_id = ii.invoice_id + join ip_invoice_item_amounts iia on iia.item_id = iit.item_id + join ip_clients ic on ic.client_id = ii.client_id + join ip_products ip on ip.product_id = iit.item_product_id + left join ip_tax_rates sgst on sgst.tax_rate_id = iit.sgst_item_tax_rate_id + left join ip_tax_rates cgst on cgst.tax_rate_id = iit.cgst_item_tax_rate_id + left join ip_tax_rates igst on igst.tax_rate_id = iit.igst_item_tax_rate_id + where icf.invoice_custom_fieldid = '8' and ii.invoice_status_id != 1 "; + if ($m!= ''){ + + $sql.="and monthname(ii.invoice_date_created) = '".$m."'"; + + } + + if ($frm and $t != ''){ + $fromdate= date("Y-m-d",strtotime($frm)); + $todate=date("Y-m-d",strtotime($t)); + + $sql.="and ii.invoice_date_created >= '".$fromdate."' + and ii.invoice_date_created <= '".$todate."'"; + + } + if ($fa and $aa != ''){ + + $sql.=" and (ii.invoice_date_created >= '".$fa."-04-01' and ii.invoice_date_created <= '".$aa."-03-31')"; + + } + //echo $sql; + $query = $this->db->query($sql); + return $query->result(); + + +} +function sales_gst($m=null,$frm=null,$t=null,$fa=null,$aa=null) +{ + +$sql = "select ii.invoice_id as invoice_id,ii.client_id as client_id,ip.product_sku as hsn_code,ii.invoice_number as doc_no,date_format(ii.invoice_date_created,'%d-%m-%Y') as date,'Sales' as doc_type,TIME_FORMAT(ii.invoice_time_created,'%l:%i %p') as invoice_time_created,icf.invoice_custom_fieldvalue as vehicle_no,ip.product_description as product_description,concat(ic.client_name,'-',ic.client_surname)as client_name,sum(iit.item_quantity) as item_quantity,sum(iit.item_price) as item_price,sum(iia.item_subtotal) as value, + sum(ifnull(((sgst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100),0)) + as sgst, + sum(ifnull(((iit.item_quantity * iit.item_price) * cgst.tax_rate_percent)/100,0)) + as cgst, + sum(ifnull((igst.tax_rate_percent * (iit.item_quantity * iit.item_price))/100,0)) + as igst, + round(sum((iia.item_subtotal + ifnull(((sgst.tax_rate_percent * iia.item_subtotal)/100),0) + + + ifnull(((iia.item_subtotal * cgst.tax_rate_percent)/100),0) + + + ifnull(((igst.tax_rate_percent * iia.item_subtotal)/100),0))),2) + as total + from ip_invoices ii + join ip_invoice_custom icf on icf.invoice_id = ii.invoice_id + join ip_invoice_items iit on iit.invoice_id = ii.invoice_id + join ip_invoice_item_amounts iia on iia.item_id = iit.item_id + join ip_clients ic on ic.client_id = ii.client_id + join ip_products ip on ip.product_id = iit.item_product_id + left join ip_tax_rates sgst on sgst.tax_rate_id = iit.sgst_item_tax_rate_id + left join ip_tax_rates cgst on cgst.tax_rate_id = iit.cgst_item_tax_rate_id + left join ip_tax_rates igst on igst.tax_rate_id = iit.igst_item_tax_rate_id + where icf.invoice_custom_fieldid = '8' and ii.invoice_status_id != 1 "; + + + + if ($m!= ''){ + + $sql.="and monthname(ii.invoice_date_created) = '".$m."'"; + + } + + if ($frm and $t != ''){ + $fromdate= date("Y-m-d",strtotime($frm)); + $todate=date("Y-m-d",strtotime($t)); + + $sql.="and ii.invoice_date_created >= '".$fromdate."' + and ii.invoice_date_created <= '".$todate."'"; + + } + if ($fa and $aa != ''){ + + $sql.=" and (ii.invoice_date_created >= '".$fa."-04-01' and ii.invoice_date_created <= '".$aa."-03-31')"; + + } + $sql.="group by doc_no,product_description"; + $query = $this->db->query($sql); + return $query->result(); + + +} +function purchase_gst($m,$frm,$t,$fa,$aa){ + + + $sql="SELECT pm.PONO as doc_no,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as date, +TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,'Purchase' as doc_type,mm.HSNCODE as hsn_code, +mm.MaterialName as material_name,sd.SupplierName as supplier_name, +ifnull(sum(distinct pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(distinct pl.Rate),0) as rate, +round(ifnull(sum(distinct pl.Quantity * pl.Rate),0),2) as value, +if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst, +ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst, +(ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) ++ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) ++ifnull(rt.Insurance,0) +-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)) as others, +round(( +if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)), +if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)), +ifnull(sum(pl.Quantity * pl.Rate),0))) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) ++ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) ++ ifnull(rt.Insurance,0) +- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total +FROM T_PurchaseOrder_Master pm +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 +left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo +where +pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' "; + + + if ($m!= ''){ + + $sql.="and monthname(pm.PODate) = '".$m."'"; + + } + + if ($frm and $t != ''){ + $fromd= date("Y-m-d",strtotime($frm)); + $tod=date("Y-m-d",strtotime($t)); + + $sql.="and date(pm.PODate) >= '".$fromd."' + and date(pm.PODate) <= '".$tod."'"; + + } + if ($fa and $aa != ''){ + + $sql.=" and (pm.PODate >= '".$fa."-04-01' and pm.PODate <= '".$aa."-03-31')"; + + } + + +$sql.="group by doc_no,material_name,supplier_name"; + + $query = $this->db->query($sql); + return $query->result(); +} } ?> \ No newline at end of file diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php index 8e2c89bb..822efbbe 100644 --- a/application/models/inwardgateregister_model.php +++ b/application/models/inwardgateregister_model.php @@ -213,16 +213,44 @@ class inwardgateregister_model extends CI_Model return $query->result(); } - } - function addmaterialhistory($historydetails) - { + } + function getpolineqty($PO) + { + $this->db->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec'); + $this->db->from('T_PurchaseOrder_LineItem'); + $this->db->where('PONO',$PO); - $this->db->trans_start(); - $this->db->insert('T_Material_stock_history', $historydetails); - $insert_id = $this->db->affected_rows(); - $this->db->trans_complete(); - return true; - } + $query = $this->db->get(); + return $query->result(); + } + + function POLineItemsupdatestatus($PO,$Newstatus) + { + $this->db->where('PONO',$PO); + $this->db->update('T_PurchaseOrder_LineItem',$Newstatus); + $update = $this->db->affected_rows(); + return $update; + + } + + function pomasterupdatestatus($PO,$Newstat) + { + $this->db->where('PONO',$PO); + $this->db->update('T_PurchaseOrder_Master',$Newstat); + $update = $this->db->affected_rows(); + return $update; + } + + + function addmaterialhistory($historydetails) + { + + $this->db->trans_start(); + $this->db->insert('T_Material_stock_history', $historydetails); + $insert_id = $this->db->affected_rows(); + $this->db->trans_complete(); + return true; + } function getitemvalue($pono,$MaterialCode) @@ -544,10 +572,8 @@ class inwardgateregister_model extends CI_Model $this->db->from('T_MRIR_Master'); $this->db->where('T_MRIR_Master.PONO',$PONO); $this->db->where('T_MRIR_Master.OGRstatus !=',OGR_COMPLETE); - //$this->db->where('Status !=',IGR_CREATED); $query = $this->db->get(); - //print_r( $this->db->last_query()); - //die(); + $result = $query->result(); return $result; diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 0e7cee61..a3c8ff61 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -92,6 +92,51 @@ $myfile=$this->db->affected_rows(); return $myfile; } +function updateigrmaster($igrno,$NewPOno) +{ + $this->db->where('IGRNO',$igrno); + $this->db->update('T_IGR_Master',$NewPOno); + $insert_id = $this->db->affected_rows(); + return $insert_id; +} +function selectigrmaster($PONO) +{ + +$this->db->select('*'); +$this->db->from('T_IGR_Master'); +$this->db->where('PONO',$PONO); + $query = $this->db->get(); + return $query->result(); + +} + +function getpolineqty($NewPO) +{ + $this->db->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec'); + $this->db->from('T_PurchaseOrder_LineItem'); + $this->db->where('PONO',$NewPO); + + $query = $this->db->get(); + return $query->result(); +} + + +function POLineItemsupdatestatus($POno,$Newstatus) +{ + $this->db->where('PONO',$POno); + $this->db->update('T_PurchaseOrder_LineItem',$Newstatus); + $update = $this->db->affected_rows(); + return $update; + +} + +function pomasterupdatestatus($POno,$Newstat) +{ + $this->db->where('PONO',$POno); + $this->db->update('T_PurchaseOrder_Master',$Newstat); + $update = $this->db->affected_rows(); + return $update; +} function getfunction($pono) diff --git a/application/views/Report_monthly_gst_table.php b/application/views/Report_monthly_gst_table.php index 86b82e35..8d994838 100644 --- a/application/views/Report_monthly_gst_table.php +++ b/application/views/Report_monthly_gst_table.php @@ -230,27 +230,33 @@ doc_type;?> hsn_code;?> value,2); + //$tot_val= $tot_val + round($rel->value,2); + $tot_val= $tot_val + $rel->value; echo $rel->value; ?> others,2); + //$tot_oth= $tot_oth + round($rel->others,2); + $tot_oth= $tot_oth + $rel->others; echo $rel->others; ?> sgst,2); + //$tot_sgst= $tot_sgst + round($rel->sgst,2); + $tot_sgst= $tot_sgst + $rel->sgst; echo $rel->sgst; ?> cgst,2); + //$tot_cgst= $tot_cgst + round($rel->cgst,2); + $tot_cgst= $tot_cgst + $rel->cgst; echo $rel->cgst; ?> igst,2); + //$tot_igst= $tot_igst + round($rel->igst,2); + $tot_igst= $tot_igst + $rel->igst; echo $rel->igst; ?> total,2); + //$tot_tot= $tot_tot + round($rel->total,2); + $tot_tot= $tot_tot + $rel->total; echo $rel->total; ?> @@ -294,7 +300,8 @@
-
+
+

@@ -207,7 +208,7 @@ if(!empty($OGR_Data))
- +
diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 1beeae1f..079506e5 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -449,13 +449,13 @@
  • - Final Product + Final Product
  • - Finished Product History + Finished Product History
    • @@ -463,20 +463,20 @@
  • - Final Product Listing + Final Product Listing
  • - Material Adjustment + Material Adjustment
  • - Material Adjustment List + Material Adjustment List
    • @@ -502,7 +502,7 @@ else{
  • - Final Product + Final Product
    • @@ -510,32 +510,32 @@ else{
  • - Finished Product History + Finished Product History
  • - Final Product Listing + Final Product Listing
  • - Material Adjustment + Material Adjustment
  • - Material Adjustment List + Material Adjustment List
  • - Material History + Material History
    • diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php index 612b4e29..7977dcbc 100644 --- a/application/views/inwardgateregister.php +++ b/application/views/inwardgateregister.php @@ -399,6 +399,7 @@ function validate() $("#del").val(obj.DeliveryDate); //$("#ser").val(obj.ServiceDescription); status = obj.status; + ostatus= obj.OGR_Status; } }); @@ -415,12 +416,13 @@ function validate() $('#content').loader('hide'); //alert(data); var trHTML = ''; - + var j=0; $.each(JSON.parse(data), function (i, item) { if(item.PendingQty !=0){ i=i+1; + j=j+1; trHTML += '' + - '' + i + '' + + '' + j + '' + '' + item.MaterialCode + '' + '' + item.MaterialName + '' + '' + item.UOM + '' + @@ -478,9 +480,12 @@ $('').attr({ $('#QuantityAsPerInvoice'+i).attr('readonly', 'true'); // $('#txtEditFreight').attr('readonly', 'true'); } - $("#IGRLink").show(); + $("#IGRLink").show(); }else{ - $("#IGRLink").hide(); + if(JSON.parse(data).length == 1 && item.PendingQty == 0){ + $("#IGRLink").hide(); + alert('The Order is completed!!'); + } } }); @@ -498,7 +503,7 @@ $('').attr({ }); - if(status == '' || status == '' || status == '' ) + if(status == '' || status == '' || status == '') { swal('The Order is completed!!'); $("#IGRLink").hide(); diff --git a/application/views/materialadjustment.php b/application/views/materialadjustment.php index fd7aed7d..929a9ca3 100644 --- a/application/views/materialadjustment.php +++ b/application/views/materialadjustment.php @@ -7,7 +7,10 @@ $(function() { $("#date").datepicker({ //maxDate : 'now', - dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy', + changeMonth: true, + changeYear: true, + yearRange: '-100:+0' }); }); @@ -256,12 +259,29 @@ $(function() {