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

bank statement handle credit note values

Browse Source
This commit is contained in:
gayathri1990 2018-07-23 13:28:54 +05:30
parent 23aaebcbf3
commit b960908751
4 changed files with 26 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
application/controllers/cashbook.php
View File

@ -313,12 +313,11 @@ class cashbook extends BaseController
$narration = $sheet->getCell('D'.$x)->getValue();
$cod =$sheet->getCell('E'.$x)->getValue();
$debit =$sheet->getCell('F'.$x)->getValue();
$credit=$sheet->getCell('G'.$x)->getValue();
$credit=$sheet->getCell('G'.$x)->getValue();
$balance=$sheet->getCell('H'.$x)->getValue();
// $IsActive=0;
$filedataupload= array('reportdate'=>$Date1,'valuedate'=>$Date2,'chequeNo'=>$cod,'Narration'=>$narration,'Cod'=> $chqno,'Debit'=>$debit,'Credit'=>$credit,'Balance'=>$balance,'Bankname'=>$bank,'IsActive'=> $IsActive);
$filedataupload= array('reportdate'=>$Date1,'valuedate'=>$Date2,'chequeNo'=>$cod,'Narration'=>$narration,'Cod'=> $chqno,'Debit'=>$debit,'Credit'=>$credit,'cbalancetocleared'=>$credit,'Balance'=>$balance,'Bankname'=>$bank,'IsActive'=> $IsActive);
@ -1008,36 +1007,13 @@ class cashbook extends BaseController
$this->loadViews("bankinvoice", $this->global,$data,NULL);
}
// public function filelist()
// {
// $pono= $this->input->post('pono');
// $data = $this->cashbook_model->debitimage($pono);
// echo json_encode($data);
// }
/*this function used to array merge files view*/
function IGRFilelist()
{
$igrno= $this->input->post('igrno');
$igrsingle = $this->cashbook_model->igrmastersingle($igrno);
$igrmultiple =$this->cashbook_model->igrmastermultiple($igrno);
$data = array_merge($igrsingle,$igrmultiple);
echo json_encode($data);
}
/*end*/
public function filelist()
public function filelist()
{
$igrno= $this->input->post('igrno');
$data = $this->cashbook_model->debitimage($igrno);
$pono= $this->input->post('pono');
$data = $this->cashbook_model->debitimage($pono);
echo json_encode($data);
}
}
public function mappingpo()
{
@ -1521,14 +1497,16 @@ class cashbook extends BaseController
$bankingbalclear = $this->input->post('bankingbalclear');
$totinvoiceamount = $this->input->post('totinvoiceamount');
$balancetoreceived = $this->input->post('balancetoreceived');
$updatebalancetoclear=$amountreceived+$bankingbalclear;
if($amountreceived<0)
{
$updateclearbalance=$bankingclear+$amountreceived;
$updatebalancetoclear=$amountreceived+$bankingbalclear;
$updateclearbalance=$amountreceived+$bankingclear;
}
else
{
$updateclearbalance=$bankingclear-$amountreceived;
$updatebalancetoclear=$bankingbalclear+$amountreceived;
$updateclearbalance=$bankingclear+$amountreceived;
}
//update Isactive field in T_Bankreport //////

102
application/models/cashbook_model.php
View File

@ -428,53 +428,15 @@ function receiptdata()
return $query->result();
}
function igrmastersingle($igrno){
$this->db->select('IGRNO,file,PONO as pono');
$this->db->from('T_IGR_Master');
$this->db->where('IGRNO',$igrno);
$query = $this->db->get();
return $query->result();
}
function igrmastermultiple($igrno){
$this->db->select('BillNo,IGRNO,FilePath,PONO');
$this->db->from('T_Inwardgateregister_fileupload');
$this->db->where('IGRNO',$igrno);
$query = $this->db->get();
return $query->result();
}
// function debitpolist($bankid)
// {
// $this->db->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount,br.Debit,
// bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath');
// $this->db->from ('T_Bankmappingpo bp');
// $this->db->join ('T_IGR_Master igrm','bp.IGRNO = igrm.IGRNO','left');
// $this->db->join ('T_PurchaseOrder_BillUpload bu','bu.PONO = bp.PONO','left');
// $this->db->join ('T_bankreport br','br.ID=bp.mid');
// $this->db->where('bp.IsActive',1);
// $this->db->where('bp.mid',$bankid);
// // $this->db->where('igrde.BankStatus !=','ST072');
// $this->db->group_by('bp.id');
// $query = $this->db->get();
// return $query->result();
// }
function debitpolist($bankid)
{
$this->db->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount,br.Debit,
bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath,inward.FilePath as Fpath');
bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath');
$this->db->from ('T_Bankmappingpo bp');
$this->db->join ('T_IGR_Master igrm','bp.IGRNO = igrm.IGRNO','left');
$this->db->join ('T_PurchaseOrder_BillUpload bu','bu.PONO = bp.PONO','left');
$this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =igrm.IGRNO','left');
$this->db->join ('T_bankreport br','br.ID=bp.mid');
$this->db->where('bp.IsActive',1);
$this->db->where('bp.mid',$bankid);
// $this->db->where('igrde.BankStatus !=','ST072');
@ -486,69 +448,29 @@ function debitpolist($bankid)
//function for image
// function debitimage($pono)
// {
// $this->db->select('bp.PONO,bp.mid,bu.FilePath,bu.BillNo,bu.IGRNO');
// $this->db->from ('T_Bankmappingpo bp');
// $this->db->join ('T_PurchaseOrder_BillUpload bu','bp.PONO = bu.PONO','left');
// $this->db->where('bp.PONO',$pono);
// $this->db->group_by('bu.BillNo');
// $query = $this->db->get();
// return $query->result();
// }
function debitimage($igrno)
function debitimage($pono)
{
$this->db->select('*');
$this->db->from ('T_PurchaseOrder_BillUpload');
$this->db->where('IGRNO',$igrno);
$query = $this->db->get();
$result = $query->result();
return $result;
$this->db->select('bp.PONO,bp.mid,bu.FilePath,bu.BillNo,bu.IGRNO');
$this->db->from ('T_Bankmappingpo bp');
$this->db->join ('T_PurchaseOrder_BillUpload bu','bp.PONO = bu.PONO','left');
$this->db->where('bp.PONO',$pono);
$this->db->group_by('bu.BillNo');
$query = $this->db->get();
return $query->result();
}
// function debitpolistfilter($SupplierName,$fdate,$tdate)
// {
// $this->db->select('bm.id,bm.mid,igrm.MaterialRcvdDate,bm.PONO,bm.Suppliername,bm.Totalpoamount,
// bm.Balancetopay,bm.Amountpaid,bm.IGRNO,igrm.file,bm.IGRLineItemNo,br.Clearbalance,br.Balancetocleared,bu.FilePath,bu.BillNo');
// $this->db->from ('T_Bankmappingpo bm');
// $this->db->join ('T_IGR_Master igrm','igrm.IGRNO = bm.IGRNO');
// //$this->db->join ('T_IGR_Details igrde','igrde.IGRNO=igrm.IGRNO');
// $this->db->join ('T_SupplierDetailsN sd','sd.SupplierName = bm.Suppliername');
// $this->db->join ('T_bankreport br','br.ID=bm.mid');
// $this->db->join ('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left');
// if($fdate!='' && $tdate!='')
// {
// $this->db->where('bm.Podate BETWEEN "'. date('Y-m-d', strtotime($fdate)). '" and "'. date('Y-m-d', strtotime($tdate)).'"');
// }
// if($SupplierName!='')
// {
// $this->db->where('sd.SupplierID',$SupplierName);
// }
// $this->db->where('bm.IsActive',1);
// $this->db->group_by('bm.id');
// $query = $this->db->get();
// return $query->result();
// }
function debitpolistfilter($SupplierName,$fdate,$tdate)
{
$this->db->select('bm.id,bm.mid,igrm.MaterialRcvdDate,bm.PONO,bm.Suppliername,bm.Totalpoamount,
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,igrm.file,bm.IGRLineItemNo,br.Clearbalance,br.Balancetocleared,bu.FilePath,bu.BillNo,inward.FilePath as Fpath');
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,igrm.file,bm.IGRLineItemNo,br.Clearbalance,br.Balancetocleared,bu.FilePath,bu.BillNo');
$this->db->from ('T_Bankmappingpo bm');
$this->db->join ('T_IGR_Master igrm','igrm.IGRNO = bm.IGRNO');
//$this->db->join ('T_IGR_Details igrde','igrde.IGRNO=igrm.IGRNO');
$this->db->join ('T_SupplierDetailsN sd','sd.SupplierName = bm.Suppliername');
$this->db->join ('T_bankreport br','br.ID=bm.mid');
$this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =igrm.IGRNO','left');
$this->db->join ('T_bankreport br','br.ID=bm.mid');
$this->db->join ('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left');
if($fdate!='' && $tdate!='')
{
@ -565,7 +487,7 @@ function debitpolist($bankid)
return $query->result();
}
function creditinvoicelist($bankid)
{
$this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,

2
application/views/bankinvoicesettlement.php
View File

@ -129,7 +129,7 @@ foreach($financialyear as $item)
<tr>
<td><?php echo $bankid?></td>
<td>Bank</td>
<td><?php echo $totalamount ?></td>
<td><?php echo $bankclear ?></td>
</tr>
</tbody>
</table>

4
application/views/bankstatement.php
View File

@ -337,10 +337,10 @@ $Bankname = $t->Bankname;
?>
<td align="left" id="credit2<?php echo $i ?>"><a href="<?php echo base_url() ?>MappingInvoice?d=<?php echo $t->ID?>&cb=<?php echo $clearbalance?>&btc=<?php echo $balanctoclear?>"><span><?php echo $clearbalance?></a></span></td>
<td align="left" id="credit2<?php echo $i ?>"><a href="<?php echo base_url() ?>MappingInvoice?d=<?php echo $t->ID?>&cb=<?php echo $clearbalance?>&btc=<?php echo $t->cbalancetocleared;?>"><span><?php echo $clearbalance?></a></span></td>
<td align="left" id="credited<?php echo $i ?>"><span><?php echo ($t->Credit)-($t->cclearbalance);?></span></td>
<td align="left" id="credited<?php echo $i ?>"><span><?php echo $t->cbalancetocleared;?></span></td>
<td align="left" id="csta<?php echo $i ?>"><span><?php echo $t->cstatus?><?php echo $t->Status?></span></td>
<!-- <td align="left" id="dsta<?php echo $i ?>"><span><?php echo $t->Status?></span></td> -->