SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bank changes

Browse Source
This commit is contained in:
gayathri1990 2018-10-22 17:35:30 +05:30
parent b03f6db30b
commit 7849106c4b
3 changed files with 3360 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/controllers/cashbook.php
View File

@ -1648,14 +1648,12 @@ class cashbook extends BaseController
$amountpaid=$data['$bankmappingamount'][0]->Amountpaid; $amountpaid=$data['$bankmappingamount'][0]->Amountpaid;
//$data['$totallineitemamount']=$this->cashbook_model->gettotallineitem($igrno); //$data['$totallineitemamount']=$this->cashbook_model->gettotallineitem($igrno);
if($amountpaid==$totalamount) if($amountpaid==$totalamount || $amountpaid!=$totalamount)
{ {
$BankStatus=NO_PAIDIGR; $BankStatus=NO_PAIDIGR;
} }
else
{
$BankStatus=PARTIALLY_PAIDIGR;
}
$result= $this->cashbook_model->IgrDetailsStatusUpdate($igrno,$BankStatus); $result= $this->cashbook_model->IgrDetailsStatusUpdate($igrno,$BankStatus);
$result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear); $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear);
@ -1693,19 +1691,14 @@ class cashbook extends BaseController
$updatebalancetoclear=$Amount+$balancetoclear; $updatebalancetoclear=$Amount+$balancetoclear;
$data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno); $data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno);
$amountpaid=$data['$bankmappingamount'][0]->Amountpaid; $amountpaid=$data['$bankmappingamount'][0]->Amountpaid;
//if($Amount==)
//$data['$totallineitemamount']=$this->cashbook_model->gettotallineitem($igrno);
if($amountpaid==$totalamount) if($amountpaid==$totalamount || $amountpaid!= $totalamount)
{ {
$BankStatus=NO_PAIDIGR; $BankStatus=NO_PAIDIGR;
} }
else
{
$BankStatus=PARTIALLY_PAIDIGR;
}
$result= $this->cashbook_model->IgrDetailsStatusUpdate($igrno,$BankStatus); $result= $this->cashbook_model->IgrDetailsStatusUpdate($igrno,$BankStatus);
$result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear); $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear);
@ -1765,10 +1758,7 @@ class cashbook extends BaseController
$receivedstatus=NO_RECEIVED; $receivedstatus=NO_RECEIVED;
$IsActive=0; $IsActive=0;
//$data['$latestamount'] = $this->cashbook_model->getlatestamount($invoiceno);
//print_r($data['$latestamount']);
//die();
//$balancetoreceived1=$data['$latestamount'][0]->balancetoreceived;
$updatebalancetoreceived=$balancetoreceived+$amountreceived; $updatebalancetoreceived=$balancetoreceived+$amountreceived;
$updateamountreceived=$totinvoiceamount-$updatebalancetoreceived; $updateamountreceived=$totinvoiceamount-$updatebalancetoreceived;
$result3= $this->cashbook_model->updatebankinvoicereport($invoiceno,$bankid,$updatebalancetoreceived,$updateamountreceived,$IsActive); $result3= $this->cashbook_model->updatebankinvoicereport($invoiceno,$bankid,$updatebalancetoreceived,$updateamountreceived,$IsActive);

3352
application/logs/log-2018-10-22.php
View File

File diff suppressed because it is too large Load Diff

2
application/models/cashbook_model.php
View File

@ -1554,7 +1554,7 @@ function receiptdata()
$this->db->join ('ip_invoices iv','iva.invoice_id = iv.invoice_id','left'); $this->db->join ('ip_invoices iv','iva.invoice_id = iv.invoice_id','left');
$this->db->join ('ip_clients ic','iv.client_id = ic.client_id','left'); $this->db->join ('ip_clients ic','iv.client_id = ic.client_id','left');
$this->db->join ('T_Bankinvoicereport BI',' iv.invoice_number =BI.invoiceno','left'); $this->db->join ('T_Bankinvoicereport BI',' iv.invoice_number =BI.invoiceno','left');
$this->db->where('iv.receivedstatus ','ST066'); $this->db->where('iv.receivedstatus','ST066');
$this->db->where('iv.invoice_status_id','2'); $this->db->where('iv.invoice_status_id','2');
$this->db->where('ic.client_id',$clientname); $this->db->where('ic.client_id',$clientname);
// $this->db->where('iv.receivedstatus','ST066'); // $this->db->where('iv.receivedstatus','ST066');