banking issues and igr file issues fixes

application/controllers/cashbook.php

@@ -1167,7 +1167,8 @@ class cashbook extends BaseController
 	public function cashbanking()
     {
 		    $data['dropdownvalues'] = $this->cashbook_model->getAccounTypes();
-            $data['cashbanking'] = $this->cashbook_model->newcashbook();
+			$data['cashbanking'] = $this->cashbook_model->newcashbook();
+			$data['getsupplier'] = $this->cashbook_model->getsupplier();
 		    $this->global['pageTitle'] ='Siddharth :bankcashbook';
             $this->loadViews("bankcashnew", $this->global,$data,NULL);
         

application/models/dahsboard_model.php

@@ -1438,7 +1438,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
 -  round(ifnull(if(POType = 'REVENUE',
    sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
    sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
-pb.FilePath as file
+   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
@@ -1538,7 +1538,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
 -  round(ifnull(if(POType = 'REVENUE',
    sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
    sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
-pb.FilePath as file
+   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
@@ -1626,7 +1626,7 @@ $sql.="group by pono,material_name,category,supplier_name";
         
         
         $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,supplier_name,
-sum(total) as total,file
+sum(total) as total,file,ifile
 from igr
 where status != 'ST030' 
 ";
@@ -2165,7 +2165,7 @@ if ($cname!= ''){
         
       $sql="select tinex.account_code as AccountCode,date_format(tinex.date,'%d-%m-%Y') as Date,ac.name as AccountName,
       tinex.type as type,tinex.cashtype as category ,tinex.merchant as merchantname,tinex.Supplier_id as Supplierid,sup.SupplierName as Suppliername, tinex.sgst as sgst,
-      tinex.value_before_gst as Value,tinex.cgst as cgst,tinex.igst as igst,
+      tinex.value_before_gst as Value,tinex.cgst as cgst,tinex.igst as igst,tinex.document as cashbookfile,
       tinex.total as Total 
       FROM t_income_expense tinex 
       join t_accountcode ac on ac.code = tinex.account_code 

application/views/Report_attach_inward.php

@@ -227,10 +227,12 @@ if(!empty($mms))
 						<?php 
 						if(!empty($rel->file)){ ?>
 						<a target="_blank" href="<?php echo  base_url().'uploads/BillFiles/'?><?php echo $rel->file ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button>File Available</button></a>	
+						<?php }else if(!empty($rel->ifile)) { 	?>
+					    <a target="_blank" href="<?php echo  base_url().''. $rel->ifile  ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button>File Available</button></a>	
 						<?php
 						}else
 						{
-							echo 'Not Available';
+							echo 'No Attachments';
 						}
 						?>
 						</span></td>

application/views/Report_purchase_inward.php

@@ -313,15 +313,11 @@ table.dataTable thead > tr > td.sorting {
 						$tot_tot= $tot_tot + round($rel->total,2);
 						?>
 						<?php 
-						if(!empty($rel->file)){ ?>
+						if(!empty($rel->file)){ ?><!-- if for Inward po file -->
 						<a target="_blank" href="<?php echo  base_url().'uploads/BillFiles/'?><?php echo $rel->file ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($rel->total,2,'.','');?></a>	
-						<?php
-						}else
-						{
-							echo number_format($rel->total,2,'.','');
-						}
-						?>
-						
+						<?php }else if(!empty($rel->ifile)) { 	?><!-- else if for igr file -->
+					    <a target="_blank" href="<?php echo  base_url().''. $rel->igrfile  ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($rel->total,2,'.','');?></a>	
+						<?php } else  { echo number_format($rel->total,2,'.',''); } ?><!-- both inwardpo file and Igr file empty means -->
 						</span></td>
 					   
 					   
@@ -368,8 +364,8 @@ table.dataTable thead > tr > td.sorting {
 						$tot_tot= $tot_tot + round($cb->Total,2);
 						?>
 						<?php 
-						if(!empty($rel->file)){ ?>
-						<a target="_blank" href="<?php echo  base_url().'uploads/BillFiles/'?><?php echo $rel->file ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($cb->Total,2,'.','');?></a>	
+						if(!empty($cb->cashbookfile)){ ?>
+						<a target="_blank" href="<?php echo  base_url().''. $cb->cashbookfile  ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($cb->Total,2,'.','');?></a>	
 						<?php
 						}else
 						{

application/views/bankcashnew.php

@@ -1,18 +1,19 @@
 <script type="text/javascript" src="<?php echo base_url();?>assets/Autocomplete/jquery.autocomplete.js"></script> 
-<?php
-foreach($dropdownvalues as $type)
-              {
-			$atype =$type->type;
-			//print_r($atype);
-			  }
+<!-- <?php
+// foreach($dropdownvalues as $type)
+//               {
+// 			$atype =$type->type;
+// 			//print_r($atype);
+// 			  }
 			  
-?>
+?> -->
 <script> 
 $(function() {
 
 	var t = [];
 	var ex = [];
 	var inc = [];
+	var supp = [];
 	t= <?php echo json_encode($dropdownvalues)?>;
 	
 	//alert(t+'t');
@@ -25,7 +26,11 @@ $(function() {
 		
 		
 	});
-	
+
+	supp = <?php echo json_encode($getsupplier)?>;
+	$.each(supp,function(s,supp){
+			$("#supplier").append( $('<option></option>').val(supp.SupplierID).html(supp.SupplierID+' - '+supp.SupplierName));	
+	});
 		
 $('#gst').click(function(){
 	$('#gstarea').toggle();
@@ -329,6 +334,18 @@ else
 								</div>
 							        
 							</div>
+
+							<div class="col-md-12">
+									<div class="col-md-3">
+									<div class="form-group">
+									<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>  
+												<select class="form-control select2 required" id="supplier" name="supplier">
+											    	<option value="-1">Select Supplier</option>	
+												</select>
+									</div>
+									</div>
+							</div>
+							
 							</div>
 							
 							<div class="row">

application/views/cashbook_cumulative_month_report.php

@@ -1,6 +1,8 @@
 <?php 
-$tiapr=0.00;$timay=0.00;$tijun=0.00;$tijul=0.00;$tiaug=0.00;$tisep=0.00;$tioct=0.00;$tinov=0.00;$tidec=0.00;$tijan=0.00;$tifeb=0.00;$timar=0.00;
-$teapr=0.00;$temay=0.00;$tejun=0.00;$tejul=0.00;$teaug=0.00;$tesep=0.00;$teoct=0.00;$tenov=0.00;$tedec=0.00;$tejan=0.00;$tefeb=0.00;$temar=0.00;
+$tiapr=0.00;$timay=0.00;$tijun=0.00;$tijul=0.00;$tiaug=0.00;$tisep=0.00;$tioct=0.00;$tinov=0.00;$tidec=0.00;
+$teapr=0.00;$temay=0.00;$tejun=0.00;$tejul=0.00;$teaug=0.00;$tesep=0.00;$teoct=0.00;$tenov=0.00;$tedec=0.00;
+$tinjan=0.00;$tinfeb=0.00;$tinmar=0.00;
+$texjan=0.00;$texfeb=0.00;$texmar=0.00;
 $rowwise = 0.00;
 if (date('m') >= 4) {
 	$yearl = date('Y').'-'.(date('Y')+1);
@@ -171,8 +173,6 @@ if (date('m') >= 4) {
 						<?php
 						  
 						 if(!empty($datas)){
-							//print_r($datas);
-							//die();
 							  foreach($datas as $d)
 							 
 					          {			
@@ -198,12 +198,12 @@ if (date('m') >= 4) {
 						<td><?php $tenov= $tenov + number_format($d->NovExpense,2,'.',''); echo number_format($d->NovExpense,2,'.',''); ?></td>
 						<td><?php $tidec= $tidec + number_format($d->DecIncome,2,'.',''); echo number_format($d->DecIncome,2,'.',''); ?></td>
 						<td><?php $tedec= $tedec + number_format($d->DecExpense,2,'.',''); echo number_format($d->DecExpense,2,'.',''); ?></td>
-						<td><?php $tijan= $tijan + number_format($d->JanIncome,2,'.',''); echo number_format($d->JanIncome,2,'.',''); ?></td>
-						<td><?php $tejan= $tejan + number_format($d->JanExpense,2,'.',''); echo number_format($d->JanExpense,2,'.',''); ?></td>
-						<td><?php $tifeb= $tifeb + number_format($d->FebIncome,2,'.',''); echo number_format($d->FebIncome,2,'.',''); ?></td>
-						<td><?php $tefeb= $tefeb + number_format($d->FebExpense,2,'.',''); echo number_format($d->FebExpense,2,'.',''); ?></td>
-						<td><?php $timar= $timar + number_format($d->MarIncome,2,'.',''); echo number_format($d->MarIncome,2,'.',''); ?></td>
-						<td><?php $timar= $temar + number_format($d->MarExpense,2,'.',''); echo number_format($d->MarExpense,2,'.',''); ?></td>
+						<td><?php $tinjan= $tinjan + number_format($d->JanIncome,2,'.',''); echo number_format($d->JanIncome,2,'.',''); ?></td>
+						<td><?php $texjan= $texjan + number_format($d->JanExpense,2,'.',''); echo number_format($d->JanExpense,2,'.',''); ?></td>
+						<td><?php $tinfeb= $tinfeb + number_format($d->FebIncome,2,'.',''); echo number_format($d->FebIncome,2,'.',''); ?></td>
+						<td><?php $texfeb= $texfeb + number_format($d->FebExpense,2,'.',''); echo number_format($d->FebExpense,2,'.',''); ?></td>
+						<td><?php $tinmar= $tinmar + number_format($d->MarIncome,2,'.',''); echo number_format($d->MarIncome,2,'.',''); ?></td>
+						<td><?php $texmar= $texmar + number_format($d->MarExpense,2,'.',''); echo number_format($d->MarExpense,2,'.',''); ?></td>
 						<td><?php $rowwise = $rowwise + number_format($d->overalltotal,2,'.',''); echo number_format($d->overalltotal,2,'.',''); ?></td>
                         </tr>
                         <?php } ?>
@@ -229,12 +229,12 @@ if (date('m') >= 4) {
 						<td><b><?php echo number_format($tenov,2,'.',''); ?></b></td>
 						<td><b><?php echo number_format($tidec,2,'.',''); ?></b></td>
 						<td><b><?php echo number_format($tedec,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($tijan,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($tejan,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($tifeb,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($tifeb,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($timar,2,'.',''); ?></b></td>
-						<td><b><?php echo number_format($timar,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($tinjan,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($texjan,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($tinfeb,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($texfeb,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($tinmar,2,'.',''); ?></b></td>
+						<td><b><?php echo number_format($texmar,2,'.',''); ?></b></td>
 						<td><b><?php echo number_format($rowwise,2,'.',''); ?></b></td>
                         </tr>
 						</tfoot>

application/views/income_expense_list.php

@@ -53,7 +53,7 @@
 		<td style="text-align:right;"><?php echo $l->total;?></td>
 		<td><?php echo $l->description;?></td>
 		 <td>
-          <a href="<?php echo base_url(); ?>cashbook/editcashbook?sid=<?php echo $l->id;?>"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the "></i>&nbsp;&nbsp;&nbsp;</a>
+          <a href="<?php echo base_url(); ?>cashbook/editcashbook?sid=<?php echo $l->id;?>"><i class="fa fa-pencil" data-toggle="tooltip" data-placement="left" title="Click here to view/Edit the ".<?php echo $l->type; ?>." Details "></i>&nbsp;&nbsp;&nbsp;</a>
 						 
 						  
                       </td>
@@ -92,13 +92,9 @@ $(function () {
       "searching": true,
 	   "aaSorting": [[ 0, "desc" ]],
       "ordering": true,
-	  "columnDefs" : [{"targets":1, "type":"date-eu"}],
-
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
 	</script>
-			<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
-