RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues fixes in ria

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-06-25 15:35:28 +05:30
parent 586195e305
commit 95021c90d2
7 changed files with 160 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
application/controllers/purchaseorder.php
View File

@ -1054,9 +1054,8 @@ class purchaseorder extends BaseController
/** /**
* To stored new values after edited Revenue datas. * To stored new values after edited Revenue datas.
*/ */
function EditRevenuePurchaseOrder() function EditRevenuePurchaseOrder()
{ {
$PONO =$this->input->post('txtPONO'); $PONO =$this->input->post('txtPONO');
$POdt =$this->input->post('PODate'); $POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
@ -1067,7 +1066,6 @@ class purchaseorder extends BaseController
$DeliveryAddr = $this->input->post('txtDeliveryAddress'); $DeliveryAddr = $this->input->post('txtDeliveryAddress');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydt');
$DeliveryOption = $this->input->post('DateRange'); $DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1){ if($DeliveryOption==1){
$Deliverydt = ''; $Deliverydt = '';
@ -1097,15 +1095,17 @@ class purchaseorder extends BaseController
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange'); $PoRange = $this->input->post('txtPoRange');
$BudgetType = $this->input->post('Budget'); $BudgetType = $this->input->post('Budget');
$SpcialInstruction = $this->input->post('SpcialInstruction'); $SpcialInstruction = $this->input->post('SpcialInstruction');
$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary'); $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
$POStatus = $this->input->post('txtStatus'); $POStatus = $this->input->post('txtStatus');
$updatedBy = $this->session->userdata('userId'); $updatedBy = $this->session->userdata('userId');
$RowCount = $this->input->post('txtRowCount'); $RowCount = $this->input->post('txtRowCount');
$DeletedRow = $this->input->post('txtDeletedRow'); $DeletedRow = $this->input->post('txtDeletedRow');
$comma_separated = explode(':', $DeletedRow); $comma_separated = explode(':', $DeletedRow);
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updateddt = $dt->format('Y-m-d H:i:s'); $updateddt = $dt->format('Y-m-d H:i:s');
@ -1118,15 +1118,14 @@ class purchaseorder extends BaseController
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
if($PODate != $b4podate ) if($PODate != $b4podate )
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4podate,'NewValue'=>$PODate,'Entity'=>'PO DateChanged'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4podate,'NewValue'=>$PODate,'Entity'=>'PO DateChanged');
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
@ -1134,18 +1133,16 @@ class purchaseorder extends BaseController
{ {
if($newSupId[0] != $b4supplier) if($newSupId[0] != $b4supplier)
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4supplier,'NewValue'=>$newsup,'Entity'=>'Supplier Changed'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>'-','UpdateBy'=>$updatedBy,'OldValue'=>$b4supplier,'NewValue'=>$newsup,'Entity'=>'Supplier Changed');
$this->purchaseorder_model->insertlogpo($logpo);
$this->purchaseorder_model->insertlogpo($logpo);
} }
} }
for ($i = 1; $i <= $RowCount; $i++) for ($i = 1; $i <= $RowCount; $i++)
{ {
$MaterialCode = $this->input->post('materialCode'.$i); $MaterialCode = $this->input->post('materialCode'.$i);
$Quantity = $this->input->post('quantity'.$i); $Quantity = $this->input->post('quantity'.$i);
$Reqnumber = $this->input->post('Reqnumber'.$i); $Reqnumber = $this->input->post('Reqnumber'.$i);
@ -1182,7 +1179,7 @@ class purchaseorder extends BaseController
if($Quantity != $b4qty) if($Quantity != $b4qty)
{ {
$logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed'); $logpo =array('PONO'=>$PONO,'LineItemNo'=>$POLineItemNo,'UpdateBy'=>$updatedBy,'OldValue'=>$b4qty,'NewValue'=>$Quantity,'Entity'=>'Quantity Changed');
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
@ -1195,6 +1192,7 @@ class purchaseorder extends BaseController
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
$SkipInsert = "False"; $SkipInsert = "False";
if( count($comma_separated) > 0) if( count($comma_separated) > 0)
{ {
@ -1212,6 +1210,7 @@ class purchaseorder extends BaseController
} }
$ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt); $ReqDetails = array('Quantity'=>$Quantity,'UpdatedBy'=>$updatedBy,'UpdatedOn'=>$updateddt);
@ -1224,35 +1223,47 @@ class purchaseorder extends BaseController
$recqty= $Quantity; $recqty= $Quantity;
$IGRD= $this->purchaseorder_model->getIGRDetails($PONO); $IGRD= $this->purchaseorder_model->getIGRDetails($PONO);
$j = $i-1;
$IGRDs = array('QuantityAsPerInvoice'=>$Quantity,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt); $IGRDs = array('QuantityAsPerInvoice'=>$Quantity,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
$this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs); $this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs);
$itemNo = $IGRD[$j]['IGRItemNo'];
} }
if($SkipInsert == "False") if($SkipInsert == "False")
{ {
if(strlen($POLineItemNo) == 0)
{
}
else
{
$LineItemNo = $POLineItemNo; $LineItemNo = $POLineItemNo;
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'ReceivedQuantity'=>$recqty,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'ReceivedQuantity'=>$recqty,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);
}
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if(count($isExists) == 0)
// $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip); {
// $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
}
else
{
$RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'CreatedBy'=>$updatedBy,'NoOfTrip'=>$NOOfTrip); $RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'CreatedBy'=>$updatedBy,'NoOfTrip'=>$NOOfTrip);
$this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList); $this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList);
}
} }
} }
echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ; echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
@ -1263,7 +1274,6 @@ class purchaseorder extends BaseController
*/ */
function pageNotFound() function pageNotFound()
{ {
//$this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
$this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL); $this->loadViews("404", $this->global, NULL, NULL);

2
application/controllers/report.php
View File

@ -513,7 +513,7 @@ class report extends BaseController
//print_r($prod); //print_r($prod);
$data['material']=$this->dahsboard_Model->material_name(); $data['material']=$this->dahsboard_Model->material_name();
$data['cust']=$this->dahsboard_Model->customer_name(); $data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear(); $data['finyear']=$this->dahsboard_Model->ireport_finyear();
$data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat); $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat);
} }
$data['material']=$this->dahsboard_Model->material_name(); $data['material']=$this->dahsboard_Model->material_name();

280
application/models/dahsboard_model.php
View File

@ -72,19 +72,15 @@ $sql="select EmpID,CONCAT(FirstName,' ',LastName) as name FROM T_Employee_Detai
} }
function attyesterday($WH,$date) function attyesterday($WH,$date)
{ {
//echo 'model' . $WH.'-'.$date;
// $sql="select EmpID,".$WH." from T_Attendance where Month_Year = ? and EmpID in (select EmpID from T_Attendance)" ; $yes_date = date('Y-m-d',strtotime("-1 days"));
$sql="select att.EmpID,ifnull(".$WH.",0)".$WH.",a.FirstName from T_Attendance as att
$sql="select att.EmpID,".$WH.",a.FirstName from T_Attendance as att
join T_Employee_Details as a on a.EmpID= att.EmpID join T_Employee_Details as a on a.EmpID= att.EmpID
where Month_Year = ? and att.EmpID in (select EmpID from T_Attendance)"; where Month_Year = ? and att.EmpID in (select EmpID from T_Attendance) and date(a.Created_date) <= '".$yes_date."' and isActive=1";
$query = $this->db->query($sql,array($date)); $query = $this->db->query($sql,array($date));
// print_r($query->result()); return $query->result_array();
//echo count($query->result());
return $query->result_array();
} }
@ -266,26 +262,36 @@ GROUP BY financial_year";
return $query->result(); return $query->result();
} }
function get_employee(){
$yes_date = date('Y-m-d',strtotime("-1 days"));
$sql = "select * from T_Employee_Details where date(created_date) <='".$yes_date."' and isActive =1";
$query = $this->db->query($sql);
return $query->result();
}
function per($fa,$aa,$m) function per($fa,$aa,$m)
{ {
$sql= "SELECT year.Eid as Eid,year.ename as ename,year.active as active,month.days as days,month.Days_Worked as worked,month.percentage as percentage,year.days as yday,year.workd as yworkd,year.percentage as ypercentage //echo $m;
$cur_month = date('M');
//echo $cur_month;
if($cur_month == $m ){
$cur_date = date('d');
}else{
$cur_date = date('t',strtotime($m));
}
//echo $cur_date;die;
$sql= "SELECT month.Eid as Eid,month.ename as ename,month.active as active,month.days as monthdays,month.Days_Worked as monthworked,month.percentage as monthpercentage
from (select em.EmpID as Eid,concat(em.FirstName,'.',em.LastName) as ename,em.IsActive as active,at.NoofDays as days, from (select em.EmpID as Eid,concat(em.FirstName,'.',em.LastName) as ename,em.IsActive as active,at.NoofDays as days,
Days_Worked,round((Days_Worked/NoofDays*100)) as percentage from Days_Worked,round((Days_Worked/".$cur_date."*100)) as percentage from
T_Employee_Details em T_Employee_Details em
join T_Attendance at on at.EmpID = em.EmpID join T_Attendance at on at.EmpID = em.EmpID
where (Month_Year >= '".$fa."-04-01' and Month_Year <= '".$aa."-04-01') and monthname(Month_Year) = '".$m."' where (Month_Year >= '".$fa."-04-01' and Month_Year <= '".$aa."-04-01') and monthname(Month_Year) = '".$m."'
) as month left join ) as month";
(select em.EmpID as Eid,concat(em.FirstName,'.',em.LastName) as ename,em.IsActive as active,sum(at.NoofDays) as days,
sum(Days_Worked) workd,round((sum(Days_Worked)/sum(NoofDays)*100)) as percentage from
T_Employee_Details em
join T_Attendance at on at.EmpID = em.EmpID
where (Month_Year >= '".$fa."-04-01' and Month_Year <= '".$aa."-04-01')
group by Eid
) as year on year.Eid = month.Eid and year.ename = month.ename
group by Eid ";
$query = $this->db->query($sql); $query = $this->db->query($sql);
return $query->result(); return $query->result();
} }
@ -376,32 +382,6 @@ $query = $this->db->query($sql);
return $query->result(); return $query->result();
} }
// function totalserviceamount()
// {
// $sql="select sum(BudgetAmount) as totalserviceamount from T_CostCenter_Budget where BudgetType='SERVICE'";
// $query = $this->db->query($sql);
// return $query->result();
// }
// function totalcapitalamount()
// {
// $sql="select sum(BudgetAmount) as totalcapitalamount from T_CostCenter_Budget where BudgetType='CAPITAL'";
// $query = $this->db->query($sql);
// return $query->result();
// }
// function totalimportamount()
// {
// $sql="select sum(BudgetAmount) as totalimportamount from T_CostCenter_Budget where BudgetType='IMPORT'";
// $query = $this->db->query($sql);
// return $query->result();
// }
// function totalrevenueamount()
// {
// $sql="select sum(BudgetAmount) as totalrevenueamount from T_CostCenter_Budget where BudgetType='REVENUE'";
// $query = $this->db->query($sql);
// return $query->result();
// }
//totalservice
function getTotalServicePoCount(){ function getTotalServicePoCount(){
$i=1; $i=1;
if (date('m') >= 4) if (date('m') >= 4)
@ -1183,7 +1163,8 @@ group by supplier_name,material_name";
case pm.POType case pm.POType
when 'IMPORT' when 'IMPORT'
then ifnull((sum(distinct(pl.Quantity * pl.Rate) * pm.ExchangeRate)),0) + ifnull(rt.Insurance,0) then ifnull((sum(distinct(pl.Quantity * pl.Rate) * pm.ExchangeRate)
),0) + ifnull(rt.Insurance,0)
when 'CAPITAL' when 'CAPITAL'
then sum(distinct if(pm.CapitalRange=0,(( pl.Quantity * pl.Rate) * pm.ExchangeRate),( pl.Quantity * pl.Rate) then sum(distinct if(pm.CapitalRange=0,(( pl.Quantity * pl.Rate) * pm.ExchangeRate),( pl.Quantity * pl.Rate)
- st.Afterdiscountval)) - st.Afterdiscountval))
@ -1492,7 +1473,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
im.file as ifile,pb.FilePath as file im.file as ifile,pb.FilePath as file
from T_IGR_Master im from T_IGR_Master im
join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO left join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO
join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode
join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO
left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
@ -1551,61 +1532,28 @@ $sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo";
$query = $this->db->query($sql); $query = $this->db->query($sql);
return $query->result(); return $query->result();
} }
function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po){ function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po){
$sql="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,round(sum(id.QuantityAsPerInvoice) * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(pm.ExchangeRate),0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate, $sql ="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, id.QuantityAsPerInvoice as quantity,pl.Rate as rate,round(id.QuantityAsPerInvoice * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',pm.ExchangeRate,0) as exchange_rate,date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate,
round(ifnull(if(POType = 'REVENUE', round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity), (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst, (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount,
round(ifnull(if(POType = 'REVENUE', round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight,
sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst, round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package,
round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), round(( if(POType = 'IMPORT',(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount, if(POType = 'CAPITAL' && CapitalRange = 0,(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
round(ifnull(if(POType = 'REVENUE', ifnull((id.QuantityAsPerInvoice * pl.Rate),0))) + round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), (id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight, (id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity), (id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity), (id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity), (id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) + round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) - round(ifnull(if(POType = 'REVENUE', (id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), (id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, im.file as ifile,pb.FilePath as file from T_IGR_Master im join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode join T_PurchaseOrder_Master pm on pm.PONO = pl.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 left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO
round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package, where pm.Status != 'ST030' ";
round((
if(POType = 'IMPORT',sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
if(POType = 'CAPITAL' && CapitalRange = 0,sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
+ round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2)
+ round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2)
+ round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2)
+ round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2)
+ round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2)
- round(ifnull(if(POType = 'REVENUE',
sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
im.file as ifile,pb.FilePath as file
from T_IGR_Master im
join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO
join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode
join T_PurchaseOrder_Master pm on pm.PONO = pl.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
left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO
where pm.Status != 'ST030' ";
if ($cname!= ''){ if ($cname!= ''){
$sql.="and sd.SupplierName = '".$cname."'"; $sql.="and sd.SupplierName = '".$cname."'";
@ -1690,7 +1638,7 @@ $sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo";
function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){ function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){
$sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name, /** $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name,
sum(total) as total,file,ifile sum(total) as total,file,ifile
from igr from igr
where status != 'ST030' where status != 'ST030'
@ -1700,9 +1648,25 @@ if ($cname!= ''){
$sql.="and supplier_name = '".$cname."'"; $sql.="and supplier_name = '".$cname."'";
} }**/
$sql="select pm.Status AS status,sd.SupplierID AS sid,im.file AS ifile,pb.FilePath AS file,im.IGRNO AS igrn,pm.POType AS potype,im.PONO AS pono,date_format(im.CreatedDate,'%d-%m-%Y') AS created_date,time_format(im.CreatedDate,'%l:%i %p') AS created_time,mm.MaterialName AS material_name,
date_format(im.MaterialRcvdDate,'%d-%m-%Y') as materialrcvddate,sd.SupplierName AS supplier_name,sum(id.QuantityAsPerInvoice) AS quantity,
round(((((((if((pm.POType = 'IMPORT'),sum((pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate))),if(((pm.POType = 'CAPITAL') and (pm.CapitalRange = 0)),sum((pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate))),ifnull(sum((id.QuantityAsPerInvoice * pl.Rate)),0))) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterSGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_SGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterCGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_CGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterIGST) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.After_IGST) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterFreightValue) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.AfterFreightValue) / pl.Quantity))),0),2)) + round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterPackagingValue) / pl.Quantity)),0),0),2)) - round(ifnull(if((pm.POType = 'REVENUE'),sum(((id.QuantityAsPerInvoice * rt.AfterDiscount) / pl.Quantity)),sum(((id.QuantityAsPerInvoice * st.Afterdiscountval) / pl.Quantity))),0),2)),2) AS total
from ((((((((T_IGR_Master im join T_PurchaseOrder_LineItem pl on((pl.PONO = im.PONO))) join T_IGR_Details id on(((id.IGRNO = im.IGRNO) and (id.MaterialCode = pl.MaterialCode)))) join T_PurchaseOrder_Master pm on((pm.PONO = pl.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)))
left join T_PurchaseOrder_BillUpload pb on((pb.PONO = im.PONO)))
where (pm.Status <> 'ST030') ";
if ($cname!= ''){
$sql.="and sd.SupplierName = '".$cname."'";
}
if ($fa and $aa != ''){ if ($fa and $aa != ''){
@ -1745,7 +1709,7 @@ if ($cname!= ''){
// group by month(CreatedDate) // group by month(CreatedDate)
// "; // ";
//echo $sql; //echo $sql;
$sql="select dat as CreatedDate,materialrcvddate,sum(quantity)as quantity,sum(value) as value,materialrcvddate $sql="select materialrcvddate,sum(quantity)as quantity,sum(value) as value,materialrcvddate
from year_inward from year_inward
where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31'
group by month(materialrcvddate)"; group by month(materialrcvddate)";
@ -1879,31 +1843,31 @@ if ($cname!= ''){
$sql="select sid,mid,supplier_name,material_name, $sql="select sid,mid,supplier_name,material_name,
SUM(IF(month(dat) = 4, quantity, 0)) AS April, SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April,
SUM(IF(month(dat) = 5, quantity, 0)) AS May, SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May,
SUM(IF(month(dat) = 6, quantity, 0)) AS June, SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June,
SUM(IF(month(dat) = 7, quantity, 0)) AS July, SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July,
SUM(IF(month(dat) = 8, quantity, 0)) AS August, SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August,
SUM(IF(month(dat) = 9, quantity, 0)) AS September, SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September,
SUM(IF(month(dat) = 10, quantity, 0)) AS October, SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October,
SUM(IF(month(dat) = 11, quantity, 0)) AS November, SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November,
SUM(IF(month(dat) = 12, quantity, 0)) AS December, SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December,
SUM(IF(month(dat) = 1, quantity, 0)) AS January, SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January,
SUM(IF(month(dat) = 2, quantity, 0)) AS February, SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February,
SUM(IF(month(dat) = 3, quantity, 0)) AS March, SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March,
sum(quantity) as qtotal, sum(quantity) as qtotal,
SUM(IF(month(dat) = 4, value, 0)) AS vApril, SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril,
SUM(IF(month(dat) = 5, value, 0)) AS vMay, SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay,
SUM(IF(month(dat) = 6, value, 0)) AS vJune, SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune,
SUM(IF(month(dat) = 7, value, 0)) AS vJuly, SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly,
SUM(IF(month(dat) = 8, value, 0)) AS vAugust, SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust,
SUM(IF(month(dat) = 9, value, 0)) AS vSeptember, SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember,
SUM(IF(month(dat) = 10, value, 0)) AS vOctober, SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober,
SUM(IF(month(dat) = 11, value, 0)) AS vNovember, SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember,
SUM(IF(month(dat) = 12, value, 0)) AS vDecember, SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember,
SUM(IF(month(dat) = 1, value, 0)) AS vJanuary, SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary,
SUM(IF(month(dat) = 2, value, 0)) AS vFebruary, SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary,
SUM(IF(month(dat) = 3, value, 0)) AS vMarch, SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch,
sum(value) as vtotal sum(value) as vtotal
FROM year_inward FROM year_inward
where status != 'ST030' "; where status != 'ST030' ";
@ -2111,32 +2075,32 @@ if ($cname!= ''){
function rawi_report_consolidate($cname,$fa,$aa){ function rawi_report_consolidate($cname,$fa,$aa){
$sql="select sid,mid,category,supplier_name,material_name, $sql="select sid,mid,category,supplier_name,material_name,
SUM(IF(month(dat) = 4, quantity, 0)) AS April, SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April,
SUM(IF(month(dat) = 5, quantity, 0)) AS May, SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May,
SUM(IF(month(dat) = 6, quantity, 0)) AS June, SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June,
SUM(IF(month(dat) = 7, quantity, 0)) AS July, SUM(IF(month(materialrcvddate) = 7, quantity, 0)) AS July,
SUM(IF(month(dat) = 8, quantity, 0)) AS August, SUM(IF(month(materialrcvddate) = 8, quantity, 0)) AS August,
SUM(IF(month(dat) = 9, quantity, 0)) AS September, SUM(IF(month(materialrcvddate) = 9, quantity, 0)) AS September,
SUM(IF(month(dat) = 10, quantity, 0)) AS October, SUM(IF(month(materialrcvddate) = 10, quantity, 0)) AS October,
SUM(IF(month(dat) = 11, quantity, 0)) AS November, SUM(IF(month(materialrcvddate) = 11, quantity, 0)) AS November,
SUM(IF(month(dat) = 12, quantity, 0)) AS December, SUM(IF(month(materialrcvddate) = 12, quantity, 0)) AS December,
SUM(IF(month(dat) = 1, quantity, 0)) AS January, SUM(IF(month(materialrcvddate) = 1, quantity, 0)) AS January,
SUM(IF(month(dat) = 2, quantity, 0)) AS February, SUM(IF(month(materialrcvddate) = 2, quantity, 0)) AS February,
SUM(IF(month(dat) = 3, quantity, 0)) AS March, SUM(IF(month(materialrcvddate) = 3, quantity, 0)) AS March,
sum(quantity) as qtotal, sum(quantity) as qtotal,
SUM(IF(month(dat) = 4, value, 0)) AS vApril, SUM(IF(month(materialrcvddate) = 4, value, 0)) AS vApril,
SUM(IF(month(dat) = 5, value, 0)) AS vMay, SUM(IF(month(materialrcvddate) = 5, value, 0)) AS vMay,
SUM(IF(month(dat) = 6, value, 0)) AS vJune, SUM(IF(month(materialrcvddate) = 6, value, 0)) AS vJune,
SUM(IF(month(dat) = 7, value, 0)) AS vJuly, SUM(IF(month(materialrcvddate) = 7, value, 0)) AS vJuly,
SUM(IF(month(dat) = 8, value, 0)) AS vAugust, SUM(IF(month(materialrcvddate) = 8, value, 0)) AS vAugust,
SUM(IF(month(dat) = 9, value, 0)) AS vSeptember, SUM(IF(month(materialrcvddate) = 9, value, 0)) AS vSeptember,
SUM(IF(month(dat) = 10, value, 0)) AS vOctober, SUM(IF(month(materialrcvddate) = 10, value, 0)) AS vOctober,
SUM(IF(month(dat) = 11, value, 0)) AS vNovember, SUM(IF(month(materialrcvddate) = 11, value, 0)) AS vNovember,
SUM(IF(month(dat) = 12, value, 0)) AS vDecember, SUM(IF(month(materialrcvddate) = 12, value, 0)) AS vDecember,
SUM(IF(month(dat) = 1, value, 0)) AS vJanuary, SUM(IF(month(materialrcvddate) = 1, value, 0)) AS vJanuary,
SUM(IF(month(dat) = 2, value, 0)) AS vFebruary, SUM(IF(month(materialrcvddate) = 2, value, 0)) AS vFebruary,
SUM(IF(month(dat) = 3, value, 0)) AS vMarch, SUM(IF(month(materialrcvddate) = 3, value, 0)) AS vMarch,
sum(value) as vtotal sum(value) as vtotal
FROM year_inward FROM year_inward
where status != 'ST030' "; where status != 'ST030' ";

1
application/views/Report_consolidate_month_inward.php
View File

@ -1,4 +1,3 @@
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css"> <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style> <style>
.dataTables_filter input {padding: 4px;} .dataTables_filter input {padding: 4px;}

2
application/views/Report_month_wise_inward.php
View File

@ -58,7 +58,7 @@
?> ?>
<tr> <tr>
<td><span> <td><span>
<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&ab=<?php echo $ab;?>&month=<?php echo $new;?>"><?php echo $rel->supplier_name;?></a> <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&ab=<?php echo $ab;?>&m=<?php echo $new;?>"><?php echo $rel->supplier_name;?></a>
</span></td> </span></td>
<td><span><?php echo $rel->material_name;?></span></td> <td><span><?php echo $rel->material_name;?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php

2
application/views/Report_year_wise_inward.php
View File

@ -1,5 +1,3 @@
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css"> <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style> <style>
.dataTables_filter input {padding: 4px;} .dataTables_filter input {padding: 4px;}

3
application/views/editRevenuepurchaseorder.php
View File

@ -4975,7 +4975,6 @@ return tot;
}); });
if(result == '0') if(result == '0')
{ {
var DelRows = $('#txtDeletedRow').val(); var DelRows = $('#txtDeletedRow').val();
@ -4990,6 +4989,7 @@ return tot;
} }
$('#txtDeletedRow').val(DelRows); $('#txtDeletedRow').val(DelRows);
} }
// To delete the value from Tables // To delete the value from Tables
else if(result == '1') else if(result == '1')
{ {
@ -5024,7 +5024,6 @@ return tot;
}}); }});
} }
//populateValueMainFormForDeleteItem(rowid);
} }