SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revenue po zero rate accept, dash board

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-11-28 10:46:55 +05:30
parent 51a8396928
commit 93cd7cd232
6 changed files with 973 additions and 934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/user.php
View File

@ -66,7 +66,18 @@ class user extends BaseController
$data['getTotalServicePoCount'] = $this->dahsboard_Model->getTotalServicePoCount();
$data['getTotalimportPoCount'] = $this->dahsboard_Model->getTotalimportPoCount();
$data['getTotalcapitalPoCount'] = $this->dahsboard_Model->getTotalcapitalPoCount();
$data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount();
$data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount();
//dashboard pie chart
$data['importbudgt'] = $this->dahsboard_Model->importbudgt();
$data['importbal'] = $this->dahsboard_Model->importbal();
$data['servicebudgt'] = $this->dahsboard_Model->servicebudgt();
$data['servicebal'] = $this->dahsboard_Model->servicebal();
$data['revenuebudgt'] = $this->dahsboard_Model->revenuebudgt();
$data['revenuebal'] = $this->dahsboard_Model->revenuebal();
$data['capitalbud'] = $this->dahsboard_Model->capitalbud();
$data['capitalbal'] = $this->dahsboard_Model->capitalbal();
$this->loadViews("dashboard", $this->global, $data , NULL);

20
application/models/dahsboard_model.php
View File

@ -853,6 +853,24 @@ group by supplier_name,material_name";
$query = $this->db->query($sql);
return $query->result();
}
function totalcapitalpo ()
{
$sql="SELECT count(cmast.PONO) as totalcapitalpo FROM T_PurchaseOrder_Master cmast
join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
join T_Requestion_Master req on req.ReqNo=line.ReqNo
join T_Status sta on sta.statusCode=req.status
where ReqType='CAPITAL'";
$query = $this->db->query($sql);
return $query->result();
}
function report_cum_day($sup=null,$mat=null){
$sql="SELECT sd.SupplierID as sid,mm.MaterialCode as mid,sd.SupplierName as supplier_name,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal
@ -868,4 +886,6 @@ group by supplier_name,material_name";
}
}
?>

12
application/views/alterpurchaseorder.php
View File

@ -7950,12 +7950,12 @@ $('.EditRevenue').click(function(){
$('#EditRevenueRate').focus();
return false;
}
else if($('#EditRevenueRate').val() == 0)
{
alert('Please Enter the Valid Rate of the Item');
$('#EditRevenueRate').focus();
return false;
}
// else if($('#EditRevenueRate').val() == 0)
// {
// alert('Please Enter the Valid Rate of the Item');
// $('#EditRevenueRate').focus();
// return false;
// }
else
{
return true;

1848
application/views/dashboard.php Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

2
application/views/editRevenueAmendPO.php
View File

@ -2529,7 +2529,7 @@ function validateEditRevenueTax()
$('#EditQuantity').focus();
return false;
}
else if($('#EditRate').val() == '' || $('#EditRate').val() == 0)
else if($('#EditRate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#EditRate').focus();

12
assets/js/CreatePOValidation.js
View File

@ -143,12 +143,12 @@ function validateRevenueTax()
$('#Rate').focus();
return false;
}
else if($('#Rate').val() == "0")
{
alert('Please Enter the Valid Rate of the Item');
$('#Rate').focus();
return false;
}
// else if($('#Rate').val() == "0")
// {
// alert('Please Enter the Valid Rate of the Item');
// $('#Rate').focus();
// return false;
// }
else
{
return true;