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

code merged form sia(27-12-17 to 11-01-18)

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-22 19:54:59 +05:30
parent be50146e6a
commit c68c84da0f
80 changed files with 3005 additions and 1596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/config/routes.php
View File

@ -236,6 +236,7 @@ $route['Report_cumulative_raw'] = "report/rawi_cumulative";
$route['Report_consolidate_category'] = "report/rawi_consolidate"; $route['Report_consolidate_category'] = "report/rawi_consolidate";
$route['Report_pending_purchase'] = "report/pending_purchase"; $route['Report_pending_purchase'] = "report/pending_purchase";
$route['Empperform']="report/per";
// Company Information // Company Information
$route['companyview'] = 'companycontroller/companyview'; $route['companyview'] = 'companycontroller/companyview';

140
application/controllers/amendmentpurchaseorder.php
View File

@ -266,17 +266,17 @@ class amendmentpurchaseorder extends BaseController
$Otherpaymentamend=$this->input->post('Otherpayment'); $Otherpaymentamend=$this->input->post('Otherpayment');
$prePaymentTerms=$this->input->post('beforePaymentTerms'); $prePaymentTerms=$this->input->post('beforePaymentTerms');
$preTotalOdervalue=$this->input->post('preTotalOdervalue'); $preTotalOdervalue=$this->input->post('preTotalOdervalue');
$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;:" . $preTotalOdervalue ."<br>"; $MAD.="Current TotalOrder Value:&nbsp;&nbsp;:" . $preTotalOdervalue ."<br>";
$testdate=date("Y-m-d"); $testdate=date("Y-m-d");
if($PaymentTerms!=$prePaymentTerms) if($PaymentTerms!=$prePaymentTerms)
{ {
if($prePaymentTerms != 'PT08'){ $Otherpaymentamend='';} if($prePaymentTerms != 'PT08'){ $Otherpaymentamend='';}
$MAD.="Amended PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText . $Otherpaymentamend ."<br>"; $MAD.="Current PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText . $Otherpaymentamend ."<br>";
} }
if(($dt != $predeliverydate)|| ($DeliverySchedule1 != $preschedule)) if(($dt != $predeliverydate)|| ($DeliverySchedule1 != $preschedule))
{ {
$MAD.='Amended Delivery Option : &nbsp;&nbsp; ' . $predeliverydate . $preschedule . '<br>' ; $MAD.='Current Delivery Option : &nbsp;&nbsp; ' . $predeliverydate . $preschedule . '<br>' ;
} }
$SpecialInstruction = $this->input->post('txtSpcialInstruction'); $SpecialInstruction = $this->input->post('txtSpcialInstruction');
@ -376,99 +376,99 @@ class amendmentpurchaseorder extends BaseController
if(($Quantity-$preqty)!=0) if(($Quantity-$preqty)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Quantity : ".$preqty ."</td><td>Current Qty : ".$Quantity."</td></tr>"; $CAD.="<tr><td>Current Quantity : ".$preqty ."</td><td>Revised Qty : ".$Quantity."</td></tr>";
} }
if(($itemRate-$preitemrate)!=0) if(($itemRate-$preitemrate)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Rate : " . $preitemrate."</td><td>Current Item Rate : ".$itemRate."</td></tr>"; $CAD.="<tr><td>Current Rate : " . $preitemrate."</td><td>Revised Item Rate : ".$itemRate."</td></tr>";
} }
if($DiscountType != $beforeDiscountType){ if($DiscountType != $beforeDiscountType){
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended DiscountType : " . $beforeDiscountType."</td><td>Current DiscountType : ".$DiscountType."</td></tr>"; $CAD.="<tr><td>Current DiscountType : " . $beforeDiscountType."</td><td>Revised DiscountType : ".$DiscountType."</td></tr>";
} }
if(($DiscountValue-$preDiscountValue)!=0) if(($DiscountValue-$preDiscountValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Discount : ". $preDiscountValue ."</td><td>Current Discount : ".$DiscountValue."</td></tr>"; $CAD.="<tr><td>Current Discount : ". $preDiscountValue ."</td><td>Revised Discount : ".$DiscountValue."</td></tr>";
} }
if(($AfterDiscount-$beforeAfterDiscount)!=0) if(($AfterDiscount-$beforeAfterDiscount)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Discount Value : ". $beforeAfterDiscount ."</td><td>Current Discount Value : ".$AfterDiscount."</td></tr>"; $CAD.="<tr><td>Current Discount Value : ". $beforeAfterDiscount ."</td><td>Revised Discount Value : ".$AfterDiscount."</td></tr>";
} }
if($PackagingType != $beforePackagingType){ if($PackagingType != $beforePackagingType){
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Packaging Type : ". $beforePackagingType ."</td><td>Current Packaging Type : ".$PackagingType."</td></tr>"; $CAD.="<tr><td>Current Packaging Type : ". $beforePackagingType ."</td><td>Revised Packaging Type : ".$PackagingType."</td></tr>";
} }
if(($PackagingValue-$prePackagingValue)!=0) if(($PackagingValue-$prePackagingValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Package Value : ". $prePackagingValue."</td><td>Current Package Value : ".$PackagingValue."</td></tr>"; $CAD.="<tr><td>Current Package Value : ". $prePackagingValue."</td><td>Revised Package Value : ".$PackagingValue."</td></tr>";
} }
if(($AfterPackagingValue-$beforeAfterPackagingValue)!=0) if(($AfterPackagingValue-$beforeAfterPackagingValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Package Value : ". $beforeAfterPackagingValue."</td><td>Current Package Value : ".$AfterPackagingValue."</td></tr>"; $CAD.="<tr><td>Current Package Value : ". $beforeAfterPackagingValue."</td><td>Revised Package Value : ".$AfterPackagingValue."</td></tr>";
} }
if(($VatValue-$preVatValue)!=0)//SGST if(($VatValue-$preVatValue)!=0)//SGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended SGST : ". $preVatValue."</td><td>Current SGST : ".$VatValue."</td></tr>"; $CAD.="<tr><td>Current SGST : ". $preVatValue."</td><td>Revised SGST : ".$VatValue."</td></tr>";
} }
if(($AfterVatValue-$beforeAfterVatValue)!=0)//SGST if(($AfterVatValue-$beforeAfterVatValue)!=0)//SGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended SGST value : ". $beforeAfterVatValue."</td><td>Current SGST Value : ".$AfterVatValue."</td></tr>"; $CAD.="<tr><td>Current SGST value : ". $beforeAfterVatValue."</td><td>Revised SGST Value : ".$AfterVatValue."</td></tr>";
} }
if(($GSTValue-$preGSTValue)!=0)//CGST if(($GSTValue-$preGSTValue)!=0)//CGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended CGST : ". $preGSTValue."</td><td>Current CGST : ".$GSTValue."</td></tr>"; $CAD.="<tr><td>Current CGST : ". $preGSTValue."</td><td>Revised CGST : ".$GSTValue."</td></tr>";
} }
if(($AfterGSTValue-$beforeAfterGSTValue)!=0)//CGST if(($AfterGSTValue-$beforeAfterGSTValue)!=0)//CGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended CGST Value : ". $beforeAfterGSTValue."</td><td>Current CGST Value : ".$AfterGSTValue."</td></tr>"; $CAD.="<tr><td>Current CGST Value : ". $beforeAfterGSTValue."</td><td>Revised CGST Value : ".$AfterGSTValue."</td></tr>";
} }
if(($OtherTaxValue-$preOtherTaxValue)!=0)//IGST if(($OtherTaxValue-$preOtherTaxValue)!=0)//IGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended IGST : ". $preOtherTaxValue."</td><td>Current IGST : ".$OtherTaxValue."</td></tr>"; $CAD.="<tr><td>Current IGST : ". $preOtherTaxValue."</td><td>Revised IGST : ".$OtherTaxValue."</td></tr>";
} }
if(($AfterOtherTaxValue-$beforeAfterOtherTaxValue)!=0)//IGST if(($AfterOtherTaxValue-$beforeAfterOtherTaxValue)!=0)//IGST
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended IGST : ". $beforeAfterOtherTaxValue."</td><td>Current IGST : ".$AfterOtherTaxValue."</td></tr>"; $CAD.="<tr><td>Current IGST : ". $beforeAfterOtherTaxValue."</td><td>Revised IGST : ".$AfterOtherTaxValue."</td></tr>";
} }
if($FreightType != $beforeFreightType){ if($FreightType != $beforeFreightType){
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Type : ". $beforeFreightType."</td><td>Current Freight Type : ".$FreightType."</td></tr>"; $CAD.="<tr><td>Current Freight Type : ". $beforeFreightType."</td><td>Revised Freight Type : ".$FreightType."</td></tr>";
} }
if(($FreightType=="PER TRIP") || ($beforeFreightType=="PER TRIP")){ if(($FreightType=="PER TRIP") || ($beforeFreightType=="PER TRIP")){
if($NoofTrips != $beforeNoofTrips) if($NoofTrips != $beforeNoofTrips)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended No of Trips : ". $beforeNoofTrips."</td><td>Current No of Trips : ".$NoofTrips."</td></tr>"; $CAD.="<tr><td>Current No of Trips : ". $beforeNoofTrips."</td><td>Revised No of Trips : ".$NoofTrips."</td></tr>";
} }
} }
if(($FreightValue-$preFreightValue)!=0) if(($FreightValue-$preFreightValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight : ". $preFreightValue."</td><td>Current Freight : ".$FreightValue."</td></tr>"; $CAD.="<tr><td>Current Freight : ". $preFreightValue."</td><td>Revised Freight : ".$FreightValue."</td></tr>";
} }
if(($AfterFreightValue-$beforeAfterFreightValue)!=0) if(($AfterFreightValue-$beforeAfterFreightValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Value : ". $beforeAfterFreightValue."</td><td>Current Freight Value : ".$AfterFreightValue."</td></tr>"; $CAD.="<tr><td>Current Freight Value : ". $beforeAfterFreightValue."</td><td>Revised Freight Value : ".$AfterFreightValue."</td></tr>";
} }
if(($InsuranceValue-$preInsuranceValue)!=0) if(($InsuranceValue-$preInsuranceValue)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Insurance Value : ". $preInsuranceValue."</td><td>Current Insurance Value : ".$InsuranceValue."</td></tr>"; $CAD.="<tr><td>Current Insurance Value : ". $preInsuranceValue."</td><td>Revised Insurance Value : ".$InsuranceValue."</td></tr>";
} }
if($rowspanvalue>0) if($rowspanvalue>0)
{ {
@ -536,11 +536,11 @@ class amendmentpurchaseorder extends BaseController
$dschedule=$this->input->post('Scheduleby'); $dschedule=$this->input->post('Scheduleby');
$beforedschedule=$this->input->post('beforeScheduleby'); $beforedschedule=$this->input->post('beforeScheduleby');
$preTotalordervalue=$this->input->post('preTotalordervalue'); $preTotalordervalue=$this->input->post('preTotalordervalue');
$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $preTotalordervalue . "<br>"; $MAD.="Current TotalOrder Value:&nbsp;&nbsp;" . $preTotalordervalue . "<br>";
if(($ddate != $beforeddate)||($dschedule != $beforedschedule)) if(($ddate != $beforeddate)||($dschedule != $beforedschedule))
{ {
$MAD.="Amended DeliveryOption :&nbsp;&nbsp;" . $beforeddate . $beforedschedule."<br>"; $MAD.="Current DeliveryOption :&nbsp;&nbsp;" . $beforeddate . $beforedschedule."<br>";
} }
$PaymentTermsText=$this->input->post('beforePaymentTermsText'); $PaymentTermsText=$this->input->post('beforePaymentTermsText');
@ -552,7 +552,7 @@ class amendmentpurchaseorder extends BaseController
if($PaymentTerms != $beforePaymentTerms) if($PaymentTerms != $beforePaymentTerms)
{ {
if($beforePaymentTerms != 'PT08'){ $Otherpaymentamend='';} if($beforePaymentTerms != 'PT08'){ $Otherpaymentamend='';}
$MAD.="Amended PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText . $Otherpaymentamend."<br>"; $MAD.="Current PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText . $Otherpaymentamend."<br>";
} }
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
@ -644,33 +644,33 @@ class amendmentpurchaseorder extends BaseController
if($Quantity != $beforeQuantity) if($Quantity != $beforeQuantity)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Qty :&nbsp;" . $beforeQuantity ."</td><td>Current Qty :&nbsp;" . $Quantity . "</td></tr>"; $CAD.="<tr><td>Current Qty :&nbsp;" . $beforeQuantity ."</td><td>Revised Qty :&nbsp;" . $Quantity . "</td></tr>";
} }
if($itemRate != $beforeitemRate) if($itemRate != $beforeitemRate)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Rate :&nbsp;" . $beforeitemRate ."</td><td>Current Rate :&nbsp;" . $itemRate . "</td></tr>"; $CAD.="<tr><td>Current Rate :&nbsp;" . $beforeitemRate ."</td><td>Revised Rate :&nbsp;" . $itemRate . "</td></tr>";
} }
if(($SGST != $beforeSGST) && ($AfterSGST != $beforeSGSTvalue)) if(($SGST != $beforeSGST) && ($AfterSGST != $beforeSGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended SGST% :&nbsp;" . $beforeSGST ."</td><td>Current SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $beforeSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $AfterSGST . "</td></tr>"; $CAD.="<tr><td>Current SGST% :&nbsp;" . $beforeSGST ."</td><td>Revised SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Current SGST value :&nbsp;" . $beforeSGSTvalue ."</td><td>Revised SGST value:&nbsp;" . $AfterSGST . "</td></tr>";
} }
if(($CGST != $beforeCGST) && ($AfterCGST != $beforeCGSTvalue)) if(($CGST != $beforeCGST) && ($AfterCGST != $beforeCGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended CGST% :&nbsp;" . $beforeCGST ."</td><td>Current CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $beforeCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $AfterCGST . "</td></tr>"; $CAD.="<tr><td>Current CGST% :&nbsp;" . $beforeCGST ."</td><td>Revised CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Current CGST value :&nbsp;" . $beforeCGSTvalue ."</td><td>Revised CGST value:&nbsp;" . $AfterCGST . "</td></tr>";
} }
if(($IGST != $beforeIGST) && ($AfterIGST != $beforeIGSTvalue)) if(($IGST != $beforeIGST) && ($AfterIGST != $beforeIGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended IGST% :&nbsp;" . $beforeIGST ."</td><td>Current IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $beforeIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $AfterIGST . "</td></tr>"; $CAD.="<tr><td>Current IGST% :&nbsp;" . $beforeIGST ."</td><td>Revised IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Current IGST value :&nbsp;" . $beforeIGSTvalue ."</td><td>Revised IGST value:&nbsp;" . $AfterIGST . "</td></tr>";
} }
if($otherallowance != $beforeotherallowance) if($otherallowance != $beforeotherallowance)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended OtherAllowances :&nbsp;" . $beforeotherallowance ."</td><td>Current OtherAllowances :&nbsp;" . $otherallowance . "</td></tr>"; $CAD.="<tr><td>Current OtherAllowances :&nbsp;" . $beforeotherallowance ."</td><td>Revised OtherAllowances :&nbsp;" . $otherallowance . "</td></tr>";
} }
if($rowspanvalue>0) if($rowspanvalue>0)
{ {
@ -741,7 +741,7 @@ class amendmentpurchaseorder extends BaseController
$Otherpayment=$this->input->post('Otherpayment'); $Otherpayment=$this->input->post('Otherpayment');
$Otherpaymentamend=$this->input->post('Otherpayment'); $Otherpaymentamend=$this->input->post('Otherpayment');
$PreServiceTotalorder = $this->input->post('preServiceTotalorderValue');//For Domestic Pre Total Value $PreServiceTotalorder = $this->input->post('preServiceTotalorderValue');//For Domestic Pre Total Value
$Totalserviceorder = $this->input->post('Totalservicesummary');//For Domestic Current Total value $Totalserviceorder = $this->input->post('Totalservicesummary');//For Domestic Revised Total value
$TotalCapitalorder= $this->input->post('CapitalToatlOrder');//For International total CapitalOrder $TotalCapitalorder= $this->input->post('CapitalToatlOrder');//For International total CapitalOrder
$preTotalCapitalorder= $this->input->post('preinterTotalorderValue');//For International pre total CapitalOrder $preTotalCapitalorder= $this->input->post('preinterTotalorderValue');//For International pre total CapitalOrder
@ -754,27 +754,27 @@ class amendmentpurchaseorder extends BaseController
$ServiceTypeOptions=$this->input->post('PoTypeOptions'); $ServiceTypeOptions=$this->input->post('PoTypeOptions');
if($PoRange==1){ if($PoRange==1){
$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $PreServiceTotalorder . "<br>"; $MAD.="Current TotalOrder Value:&nbsp;&nbsp;" . $PreServiceTotalorder . "<br>";
}else if($PoRange==0){ }else if($PoRange==0){
$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $preTotalCapitalorder . "<br>"; $MAD.="Current TotalOrder Value:&nbsp;&nbsp;" . $preTotalCapitalorder . "<br>";
} }
if($PaymentMethod != $prePaymentmethod) if($PaymentMethod != $prePaymentmethod)
{ {
if($prePaymentmethod != 'PT08'){ $Otherpaymentamend='';} if($prePaymentmethod != 'PT08'){ $Otherpaymentamend='';}
$MAD.="Amended Paymemnt Terms :&nbsp;&nbsp;" .$prePaymentmethodtext."<br>"; $MAD.="Current Paymemnt Terms :&nbsp;&nbsp;" .$prePaymentmethodtext."<br>";
} }
if($predispatch != $curdispatch) if($predispatch != $curdispatch)
{ {
$MAD.="Amended Delivery Option :&nbsp;&nbsp;" .$predispatch.$preDeliverySchedule.$preDate."<br>"; $MAD.="Current Delivery Option :&nbsp;&nbsp;" .$predispatch.$preDeliverySchedule.$preDate."<br>";
} }
if($DeliverySchedule1!= $preDeliverySchedule) if($DeliverySchedule1!= $preDeliverySchedule)
{ {
$MAD.="Amended DeliveyOption :&nbsp;&nbsp;" .$preDeliverySchedule.$preDate.$predispatch."<br>"; $MAD.="Current DeliveyOption :&nbsp;&nbsp;" .$preDeliverySchedule.$preDate.$predispatch."<br>";
} }
if($preDate != $Date) if($preDate != $Date)
{ {
$MAD.="Amended DeliveyOption :&nbsp;&nbsp;" .$preDate.$preDeliverySchedule."<br>"; $MAD.="Current DeliveyOption :&nbsp;&nbsp;" .$preDate.$preDeliverySchedule."<br>";
} }
$capitalType = $this->input->post('capitalType'); $capitalType = $this->input->post('capitalType');
@ -940,60 +940,60 @@ class amendmentpurchaseorder extends BaseController
if($Quantity != $preQuantity) if($Quantity != $preQuantity)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Qty :&nbsp;" . $preQuantity ."</td><td>Current Qty :&nbsp;" . $Quantity . "</td></tr>"; $CAD.="<tr><td>Current Qty :&nbsp;" . $preQuantity ."</td><td>Revised Qty :&nbsp;" . $Quantity . "</td></tr>";
} }
if($itemRate != $preitemRate) if($itemRate != $preitemRate)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Rate :&nbsp;" . $preitemRate ."</td><td>Current Rate :&nbsp;" . $itemRate . "</td></tr>"; $CAD.="<tr><td>Current Rate :&nbsp;" . $preitemRate ."</td><td>Revised Rate :&nbsp;" . $itemRate . "</td></tr>";
} }
if($PoRange==1){ if($PoRange==1){
if(($DiscountValue!=$preDiscountValue) && ($AfterDiscount!=$preAfterDiscount)){ if(($DiscountValue!=$preDiscountValue) && ($AfterDiscount!=$preAfterDiscount)){
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended Discount :&nbsp;" . $preDiscountValue ."</td><td>Current Discount :&nbsp;" . $DiscountValue . "</td></tr><tr><td>Amended Discount value :&nbsp;" . $preAfterDiscount ."</td><td>Current Discount value:&nbsp;" . $AfterDiscount . "</td></tr>"; $CAD.="<tr><td>Current Discount :&nbsp;" . $preDiscountValue ."</td><td>Revised Discount :&nbsp;" . $DiscountValue . "</td></tr><tr><td>Current Discount value :&nbsp;" . $preAfterDiscount ."</td><td>Revised Discount value:&nbsp;" . $AfterDiscount . "</td></tr>";
} }
if(($SGST != $preSGST) && ($SGSTvalue != $preSGSTvalue)) if(($SGST != $preSGST) && ($SGSTvalue != $preSGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended SGST% :&nbsp;" . $preSGST ."</td><td>Current SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $preSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $SGSTvalue . "</td></tr>"; $CAD.="<tr><td>Current SGST% :&nbsp;" . $preSGST ."</td><td>Revised SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Current SGST value :&nbsp;" . $preSGSTvalue ."</td><td>Revised SGST value:&nbsp;" . $SGSTvalue . "</td></tr>";
} }
if(($CGST != $preCGST) && ($CGSTvalue != $preCGSTvalue)) if(($CGST != $preCGST) && ($CGSTvalue != $preCGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended CGST% :&nbsp;" . $preCGST ."</td><td>Current CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $preCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $CGSTvalue . "</td></tr>"; $CAD.="<tr><td>Current CGST% :&nbsp;" . $preCGST ."</td><td>Revised CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Current CGST value :&nbsp;" . $preCGSTvalue ."</td><td>Revised CGST value:&nbsp;" . $CGSTvalue . "</td></tr>";
} }
if(($IGST != $preIGST) && ($IGSTvalue != $preIGSTvalue)) if(($IGST != $preIGST) && ($IGSTvalue != $preIGSTvalue))
{ {
$rowspanvalue+=2; $rowspanvalue+=2;
$CAD.="<tr><td>Amended IGST% :&nbsp;" . $preIGST ."</td><td>Current IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $preIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $IGSTvalue . "</td></tr>"; $CAD.="<tr><td>Current IGST% :&nbsp;" . $preIGST ."</td><td>Revised IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Current IGST value :&nbsp;" . $preIGSTvalue ."</td><td>Revised IGST value:&nbsp;" . $IGSTvalue . "</td></tr>";
} }
if($otherallowance != $preotherallowance) if($otherallowance != $preotherallowance)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended OtherAllowances :&nbsp;" . $preotherallowance ."</td><td>Current OtherAllowances :&nbsp;" . $otherallowance . "</td></tr>"; $CAD.="<tr><td>Current OtherAllowances :&nbsp;" . $preotherallowance ."</td><td>Revised OtherAllowances :&nbsp;" . $otherallowance . "</td></tr>";
} }
if($FreightTypeloc != $beforeFreightTypeloc) if($FreightTypeloc != $beforeFreightTypeloc)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Type :&nbsp;" . $beforeFreightTypeloc ."</td><td>Current Qty :&nbsp;" . $FreightTypeloc . "</td></tr>"; $CAD.="<tr><td>Current Freight Type :&nbsp;" . $beforeFreightTypeloc ."</td><td>Revised Qty :&nbsp;" . $FreightTypeloc . "</td></tr>";
} }
if($FreightNoofTriploc != $beforeFreightNoofTriploc) if($FreightNoofTriploc != $beforeFreightNoofTriploc)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Nooftrips :&nbsp;" . $beforeFreightNoofTriploc ."</td><td>Current Freight Nooftrips:&nbsp;" . $FreightNoofTriploc . "</td></tr>"; $CAD.="<tr><td>Current Freight Nooftrips :&nbsp;" . $beforeFreightNoofTriploc ."</td><td>Revised Freight Nooftrips:&nbsp;" . $FreightNoofTriploc . "</td></tr>";
} }
if($Freightrateloc != $beforeFreightrateloc) if($Freightrateloc != $beforeFreightrateloc)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Rate :&nbsp;" . $beforeFreightrateloc ."</td><td>Current Freight Rate:&nbsp;" . $Freightrateloc . "</td></tr>"; $CAD.="<tr><td>Current Freight Rate :&nbsp;" . $beforeFreightrateloc ."</td><td>Revised Freight Rate:&nbsp;" . $Freightrateloc . "</td></tr>";
} }
if($FreightAmountloc != $beforeFreightAmountloc) if($FreightAmountloc != $beforeFreightAmountloc)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD.="<tr><td>Amended Freight Amount :&nbsp;" .$beforeFreightAmountloc ."</td><td>Current Freight Amount:&nbsp;" . $FreightAmountloc . "</td></tr>"; $CAD.="<tr><td>Current Freight Amount :&nbsp;" .$beforeFreightAmountloc ."</td><td>Revised Freight Amount:&nbsp;" . $FreightAmountloc . "</td></tr>";
} }
@ -1001,21 +1001,21 @@ class amendmentpurchaseorder extends BaseController
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Assessable : ".$beforeAssable ."</td><td>Current CustomDuty:".$Assable."</td></tr>"; $CAD=$CAD."<tr><td>Current Assessable : ".$beforeAssable ."</td><td>Revised CustomDuty:".$Assable."</td></tr>";
} }
if(($Subtotal-$beforeSubtotal)!=0) if(($Subtotal-$beforeSubtotal)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Subtotal : ".$beforeSubtotal ."</td><td>Current Subtotal:".$Subtotal."</td></tr>"; $CAD=$CAD."<tr><td>Current Subtotal : ".$beforeSubtotal ."</td><td>Revised Subtotal:".$Subtotal."</td></tr>";
} }
if(($Igst-$beforeIgst)!=0) if(($Igst-$beforeIgst)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended IGST Percentage : ".$beforeIgst ."</td><td>Current IGST Percentage:".$Igst."</td></tr>"; $CAD=$CAD."<tr><td>Current IGST Percentage : ".$beforeIgst ."</td><td>Revised IGST Percentage:".$Igst."</td></tr>";
} }
} }
@ -1104,7 +1104,7 @@ class amendmentpurchaseorder extends BaseController
$TotalOrder = $this->input->post('txttot'); $TotalOrder = $this->input->post('txttot');
$AmendTotal=$this->input->post('txttotamend'); $AmendTotal=$this->input->post('txttotamend');
$MAD.="Amended Total Order Value:&nbsp;&nbsp;:" . $AmendTotal ."<br>"; $MAD.="Current Total Order Value:&nbsp;&nbsp;:" . $AmendTotal ."<br>";
$POStatus = $this->input->post('txtStatus'); $POStatus = $this->input->post('txtStatus');
$CreateBy = $this->session->userdata ( 'userId' ); $CreateBy = $this->session->userdata ( 'userId' );
@ -1145,7 +1145,7 @@ class amendmentpurchaseorder extends BaseController
if($PaymentTerms!=$beforePaymentTerms) if($PaymentTerms!=$beforePaymentTerms)
{ {
$MAD.="Amended Payment Terms&nbsp;&nbsp;" . $beforePaymentTerms."<br>"; $MAD.="Current Payment Terms&nbsp;&nbsp;" . $beforePaymentTerms."<br>";
} }
$Palaceoforigin=$this->input->post('PlaceOforigin'); $Palaceoforigin=$this->input->post('PlaceOforigin');
@ -1154,7 +1154,7 @@ class amendmentpurchaseorder extends BaseController
if($Palaceoforigin!=$beforePalaceoforigin) if($Palaceoforigin!=$beforePalaceoforigin)
{ {
$MAD.=$MAD."Amended Place of Origin:&nbsp;&nbsp;" . $beforePalaceoforigin."<br>"; $MAD.=$MAD."Current Place of Origin:&nbsp;&nbsp;" . $beforePalaceoforigin."<br>";
} }
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'AmendedDetails'=>$MAD,'PaymentOtherDescription'=>$OtherPayment,'InsuranceStatus'=>$insurestatus,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption); $POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'AmendedDetails'=>$MAD,'PaymentOtherDescription'=>$OtherPayment,'InsuranceStatus'=>$insurestatus,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption);
@ -1251,14 +1251,14 @@ class amendmentpurchaseorder extends BaseController
if(($itemRate-$beforeitemRate)!=0) if(($itemRate-$beforeitemRate)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Rate : ".$beforeitemRate ."</td><td>Current Rate:".$itemRate."</td></tr>"; $CAD=$CAD."<tr><td>Current Rate : ".$beforeitemRate ."</td><td>Revised Rate:".$itemRate."</td></tr>";
} }
if(($Quantity-$beforeQuantity)!=0) if(($Quantity-$beforeQuantity)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Quantity : ".$beforeQuantity ."</td><td>Current Quantity:".$Quantity."</td></tr>"; $CAD=$CAD."<tr><td>Current Quantity : ".$beforeQuantity ."</td><td>Revised Quantity:".$Quantity."</td></tr>";
} }
@ -1266,87 +1266,87 @@ class amendmentpurchaseorder extends BaseController
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Landing percentage : ".$beforeLandingCharge ."</td><td>Current Landing Percentage:".$LandingCharge."</td></tr>"; $CAD=$CAD."<tr><td>Current Landing percentage : ".$beforeLandingCharge ."</td><td>Revised Landing Percentage:".$LandingCharge."</td></tr>";
} }
if(($CustomDuty-$beforeCustomDuty)!=0) if(($CustomDuty-$beforeCustomDuty)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended CustomDuty : ".$beforeCustomDuty ."</td><td>Current CustomDuty:".$CustomDuty."</td></tr>"; $CAD=$CAD."<tr><td>Current CustomDuty : ".$beforeCustomDuty ."</td><td>Revised CustomDuty:".$CustomDuty."</td></tr>";
} }
if($CustomEd-$beforeCustomEd) if($CustomEd-$beforeCustomEd)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended CustomEd : ".$beforeCustomEd ."</td><td>Current CustomEd:".$CustomEd."</td></tr>"; $CAD=$CAD."<tr><td>Current CustomEd : ".$beforeCustomEd ."</td><td>Revised CustomEd:".$CustomEd."</td></tr>";
} }
if($CustomSH-$beforeCustomSH) if($CustomSH-$beforeCustomSH)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended CustomSH : ".$beforeCustomSH ."</td><td>Current CustomSH:".$CustomSH."</td></tr>"; $CAD=$CAD."<tr><td>Current CustomSH : ".$beforeCustomSH ."</td><td>Revised CustomSH:".$CustomSH."</td></tr>";
} }
if($FreightType!=$beforeFreightType) if($FreightType!=$beforeFreightType)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Freight Type: ".$beforeFreightType ."</td><td>Current Freight Type:".$FreightType."</td></tr>"; $CAD=$CAD."<tr><td>Current Freight Type: ".$beforeFreightType ."</td><td>Revised Freight Type:".$FreightType."</td></tr>";
} }
if($NoOfTrip-$beforeNoOfTrip) if($NoOfTrip-$beforeNoOfTrip)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended No of Trip: ".$beforeNoOfTrip ."</td><td>Current Additional Excise duty:".$NoOfTrip."</td></tr>"; $CAD=$CAD."<tr><td>Current No of Trip: ".$beforeNoOfTrip ."</td><td>Revised Additional Excise duty:".$NoOfTrip."</td></tr>";
} }
if($Freightrate-$beforeFreightrate) if($Freightrate-$beforeFreightrate)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Freightrate: ".$beforeFreightrate ."</td><td>Current Freightrate:".$Freightrate."</td></tr>"; $CAD=$CAD."<tr><td>Current Freightrate: ".$beforeFreightrate ."</td><td>Revised Freightrate:".$Freightrate."</td></tr>";
} }
if($Freightamount-$beforeFreightamount) if($Freightamount-$beforeFreightamount)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Freight Amount: ".$beforeFreightamount ."</td><td>Current Freight Amount:".$Freightamount."</td></tr>"; $CAD=$CAD."<tr><td>Current Freight Amount: ".$beforeFreightamount ."</td><td>Revised Freight Amount:".$Freightamount."</td></tr>";
} }
if($per!=$beforeper) if($per!=$beforeper)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Per Value: ".$beforeper ."</td><td>Current Per Value:".$per."</td></tr>"; $CAD=$CAD."<tr><td>Current Per Value: ".$beforeper ."</td><td>Revised Per Value:".$per."</td></tr>";
} }
if(($Assable-$beforeAssable)!=0) if(($Assable-$beforeAssable)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Assessable : ".$beforeAssable ."</td><td>Current CustomDuty:".$Assable."</td></tr>"; $CAD=$CAD."<tr><td>Current Assessable : ".$beforeAssable ."</td><td>Revised CustomDuty:".$Assable."</td></tr>";
} }
if(($Subtotal-$beforeSubtotal)!=0) if(($Subtotal-$beforeSubtotal)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Subtotal : ".$beforeSubtotal ."</td><td>Current Subtotal:".$Subtotal."</td></tr>"; $CAD=$CAD."<tr><td>Current Subtotal : ".$beforeSubtotal ."</td><td>Revised Subtotal:".$Subtotal."</td></tr>";
} }
if(($Igst-$beforeIgst)!=0) if(($Igst-$beforeIgst)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended IGST Percentage : ".$beforeIgst ."</td><td>Current IGST Percentage:".$Igst."</td></tr>"; $CAD=$CAD."<tr><td>Current IGST Percentage : ".$beforeIgst ."</td><td>Revised IGST Percentage:".$Igst."</td></tr>";
} }
if(($Grossdutypayable-$beforeGrossdutypayable)!=0) if(($Grossdutypayable-$beforeGrossdutypayable)!=0)
{ {
$rowspanvalue++; $rowspanvalue++;
$CAD=$CAD."<tr><td>Amended Gross Duty Payable : ".$beforeGrossdutypayable ."</td><td>Current Gross Duty Payable:".$Grossdutypayable."</td></tr>"; $CAD=$CAD."<tr><td>Current Gross Duty Payable : ".$beforeGrossdutypayable ."</td><td>Revised Gross Duty Payable:".$Grossdutypayable."</td></tr>";
} }
if($rowspanvalue>0) if($rowspanvalue>0)

57
application/controllers/inwardgateregister.php
View File

@ -78,6 +78,40 @@ class inwardgateregister extends BaseController
echo json_encode($data); echo json_encode($data);
} }
/**
* To upload IGR files
*/
function uploadFile()
{
$pathinfo = pathinfo($_FILES['myfile']['name']);
$config['upload_path'] = 'uploads/Igrfiles/';
$config['allowed_types'] = 'png|jpg|jpeg|pdf|docx';
$config['file_name'] = $_FILES['myfile']['name'];
//Load upload library and initialize configuration
$this->load->library('upload',$config);
$this->upload->initialize($config);
if($this->upload->do_upload('myfile'))
{
$uploadData = $this->upload->data();
$uploadfilename = $uploadData['file_name'];
return $uploadfilename;
}
else
{
$error = array('error' => $this->upload->display_errors());
$uploadfilename = '';
print_r($error);
return 0;
}
}
/** /**
* To Store IGR data into DB * To Store IGR data into DB
*/ */
@ -103,9 +137,28 @@ class inwardgateregister extends BaseController
$IGRStatus = IGR_CREATED; $IGRStatus = IGR_CREATED;
$document = null;
$fs = 0;
if(!empty($_FILES['myfile']['name']))
{
$config['file_name'] = $_FILES['myfile']['name'];
$config['upload_path'] = 'uploads/Igrfiles/';
$config['allowed_types'] = 'png|jpg|jpeg|pdf|docx';
$path = $config['upload_path'];
$filename = $config['file_name'];
$document = $path.$filename;
$fs = $this->uploadFile();
$document = $path.$fs;
}
$igr = array(); $igr = array();
$igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt); $igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document);
$igrM = $this->inwardgateregister_model->addigrM($igr); $igrM = $this->inwardgateregister_model->addigrM($igr);
@ -169,7 +222,7 @@ class inwardgateregister extends BaseController
} }
$this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy); $this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy);
echo 'Successfully Created IGR Number:'. $IGRNO; echo "<script>alert('Successfully Created IGR Number:$IGRNO'); window.location.href='viewIGRDetails';</script>";
} }
/** /**

2
application/controllers/login.php
View File

@ -53,7 +53,7 @@ class Login extends CI_Controller
$this->load->library('form_validation'); $this->load->library('form_validation');
$this->form_validation->set_rules('email', 'Email', 'required|valid_email|max_length[128]|xss_clean|trim'); //$this->form_validation->set_rules('email', 'Email', 'required|valid_email|max_length[128]|xss_clean|trim');
$this->form_validation->set_rules('password', 'Password', 'required|max_length[32]|'); $this->form_validation->set_rules('password', 'Password', 'required|max_length[32]|');
$designation=''; $designation='';
$role=''; $role='';

33
application/controllers/payslip.php
View File

@ -452,6 +452,7 @@ class payslip extends BaseController
$current = date("m-Y"); $current = date("m-Y");
$data['month'] = $this-> monthlypay_model->monthlyListing($current); $data['month'] = $this-> monthlypay_model->monthlyListing($current);
$data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
$data['dropdownvalue'] = $current;
$this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; $this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs';
$this->loadViews("monthlypayinputs", $this->global,$data,NULL); $this->loadViews("monthlypayinputs", $this->global,$data,NULL);
@ -464,11 +465,19 @@ class payslip extends BaseController
function changeMonth() function changeMonth()
{ {
$current = $this->input->post('param1'); // $current = $this->input->post('param1');
$month = $this-> monthlypay_model->monthlyListing($current); // $month = $this-> monthlypay_model->monthlyListing($current);
$fresh = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); // $fresh = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
$data = json_encode(array_merge($month,$fresh)); // $data = json_encode(array_merge($month,$fresh));
echo $data; // echo $data;
$current = $this->input->post('monthyear');
$data['month'] = $this-> monthlypay_model->monthlyListing($current);
$data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
$data['dropdownvalue'] = $current;
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
$this->loadViews("monthlypayinputs", $this->global,$data,NULL);
} }
/** /**
@ -619,11 +628,25 @@ class payslip extends BaseController
*/ */
function payslipLisiting() function payslipLisiting()
{ {
$curr_year = date('Y');
$curr_month =date('m');
$curr_monthyear = $curr_month.'-'.$curr_year;
$this->global['pageTitle'] = 'Resico : Payslip Listing'; $this->global['pageTitle'] = 'Resico : Payslip Listing';
$data['PayInfo'] = $this->payroll_model->GetPayslipdata(); $data['PayInfo'] = $this->payroll_model->GetPayslipdata();
$data['dropdownvalue'] = $curr_monthyear;
$this->loadViews("paysliplist", $this->global, $data , NULL); $this->loadViews("paysliplist", $this->global, $data , NULL);
} }
function reload_paysliplist()
{
$pre_monthyear = $this->input->post('month');
$this->global['pageTitle'] = 'Siddharth : Payslip Listing';
$data['PayInfo'] = $this->payroll_model->GetPayslipdata($pre_monthyear);
$data['dropdownvalue'] = $pre_monthyear;
$this->loadViews("paysliplist", $this->global, $data , NULL);
}
/** /**
* To view the Supplier information and load's the edit supplier screen * To view the Supplier information and load's the edit supplier screen
*/ */

12
application/controllers/purchaseorder.php
View File

@ -1233,7 +1233,7 @@ class purchaseorder extends BaseController
$PoStatus=''; $PoStatus='';
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO);
@ -1310,15 +1310,16 @@ $AdvanceAmount=0.00;
{ {
$PoStatus=''; $PoStatus='';
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForpdf($PONO); $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForpdf($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$data['serviceTaxList'] = $this->purchaseorder_model->GetServiceTaxDetails($PONO); $data['serviceTaxList'] = $this->purchaseorder_model->GetServiceTaxDetails($PONO);
$data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR'); $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
@ -1403,6 +1404,7 @@ public function importpoprint($PONO)
$Depcode=''; $Depcode='';
$Currencycode=''; $Currencycode='';
$PoStatus=''; $PoStatus='';
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
@ -2659,10 +2661,10 @@ function addNewImportPurchaseOrder()
$PoStatus=''; $PoStatus='';
// Load the pdf page with multiviews // Load the pdf page with multiviews
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$CurrencyType=''; $CurrencyType='';

1
application/controllers/quality.php
View File

@ -420,6 +420,7 @@ class quality extends BaseController
function addNewInward_Report() function addNewInward_Report()
{ {
$data['records'] = $this->quality_model->getIGRNOforReport(); $data['records'] = $this->quality_model->getIGRNOforReport();
$data['reports'] = $this->quality_model->getIGRNOReport();
$data['emplist'] = $this->quality_model->getEmplistforReport(); $data['emplist'] = $this->quality_model->getEmplistforReport();
$this->global['pageTitle'] = 'Resico : Inward Inspection'; $this->global['pageTitle'] = 'Resico : Inward Inspection';
$this->loadViews("inward_report_create", $this->global,$data,NULL); $this->loadViews("inward_report_create", $this->global,$data,NULL);

47
application/controllers/report.php
View File

@ -380,7 +380,10 @@ class report extends BaseController
if ($this->input->post('financialyear')) { if ($this->input->post('financialyear')) {
$data['year']=$this->dahsboard_Model->report_year_wise(); $ab=$this->input->post('financialyear');
$a=substr($ab,0,-5);
$b=substr($ab,5,5);
$data['year']=$this->dahsboard_Model->report_year_wise($a,$b);
$data['finyear']=$this->dahsboard_Model->report_finyear(); $data['finyear']=$this->dahsboard_Model->report_finyear();
//$this->loadviews("Report_year_wise",$this->global,$data, NULL); //$this->loadviews("Report_year_wise",$this->global,$data, NULL);
@ -517,7 +520,7 @@ class report extends BaseController
$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->report_finyear();
$data['spurchse']=$this->dahsboard_Model->consolidate_month($m,$cname,$mid,$fa,$aa); $data['spurchse']=$this->dahsboard_Model->consolidate_month($m,$sid,$mid,$fa,$aa);
if($this->DEPCode == MANAGEMENT) if($this->DEPCode == MANAGEMENT)
{ {
$this->loadviews("Report_consolidate_m",$this->global,$data, NULL); $this->loadviews("Report_consolidate_m",$this->global,$data, NULL);
@ -542,7 +545,7 @@ class report extends BaseController
$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->report_finyear();
$data['spurchse']=$this->dahsboard_Model->consolidate_year($cname,$mid,$fa,$aa); $data['spurchse']=$this->dahsboard_Model->consolidate_year($sid,$mid,$fa,$aa);
if($this->DEPCode == MANAGEMENT) if($this->DEPCode == MANAGEMENT)
{ {
$this->loadviews("Report_consolidate_y",$this->global,$data, NULL); $this->loadviews("Report_consolidate_y",$this->global,$data, NULL);
@ -732,9 +735,11 @@ class report extends BaseController
if ($this->input->post('financialyear')) { if ($this->input->post('financialyear')) {
$ab=$this->input->post('financialyear');
$data['year']=$this->dahsboard_Model->ireport_year_wise(); $a=substr($ab,0,-5);
$data['finyear']=$this->dahsboard_Model->report_finyear(); $b=substr($ab,5,5);
$data['year']=$this->dahsboard_Model->ireport_year_wise($a,$b);
$data['finyear']=$this->dahsboard_Model->report_finyear();
//$this->loadviews("Report_year_wise",$this->global,$data, NULL); //$this->loadviews("Report_year_wise",$this->global,$data, NULL);
} }
@ -883,7 +888,7 @@ class report extends BaseController
$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->report_finyear();
$data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$cname,$prod,$fa,$aa); $data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$sid,$prod,$fa,$aa);
// print_r( $data['spurchse']); // print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT) if($this->DEPCode == MANAGEMENT)
{ {
@ -912,7 +917,7 @@ class report extends BaseController
$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->report_finyear();
$data['spurchse']=$this->dahsboard_Model->i_consolidate_year($cname,$prod,$fa,$aa); $data['spurchse']=$this->dahsboard_Model->i_consolidate_year($sid,$mid,$fa,$aa);
// print_r( $data['spurchse']); // print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT) if($this->DEPCode == MANAGEMENT)
{ {
@ -1204,6 +1209,32 @@ class report extends BaseController
} }
public function per()
{
$this->global['pageTitle'] = 'Siddharth : Reports';
$ab=$this->input->post('financialyear');
$fa=substr($ab,0,-5);
$aa=substr($ab,5,5);
$m=$this->input->post('month');
$data['fy']=$this->dahsboard_Model->fy();
$data['per']=$this->dahsboard_Model->per($fa,$aa,$m);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("report_emp",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function cashbook() public function cashbook()
{ {

16
application/controllers/requisitionform.php
View File

@ -104,7 +104,13 @@ class requisitionform extends BaseController
} }
$data['ReqPOType'] = $ReqPOType =='' ? $ReqType:$ReqPOType; $data['ReqPOType'] = $ReqPOType =='' ? $ReqType:$ReqPOType;
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo); $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
$data['description']='';
foreach($data['LineItem'] as $line)
{
$description= $line->MaterialDescription;
}
$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID); $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
$data['ServiceOption'] = $this->requistion_model->getConfigValue('C022'); $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022');
@ -405,8 +411,9 @@ class requisitionform extends BaseController
{ {
$MaterialCode = $this->input->post('MaterialCode'.$i); $MaterialCode = $this->input->post('MaterialCode'.$i);
$Quantity = $this->input->post('Quantity'.$i); $Quantity = $this->input->post('Quantity'.$i);
$OtherD = $this->input->post('otherD'.$i);
$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity); $ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'MaterialDescription'=>$OtherD);
$this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber); $this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber);
} }
@ -481,15 +488,16 @@ class requisitionform extends BaseController
{ {
$MaterialCode = $this->input->post('MaterialCode'.$i); $MaterialCode = $this->input->post('MaterialCode'.$i);
$Quantity = $this->input->post('Quantity'.$i); $Quantity = $this->input->post('Quantity'.$i);
$otherD =$this->input->post('otherD'.$i);
$IsExists = $this->requistion_model->LineItemIsExists($ReqNumber,$MaterialCode); $IsExists = $this->requistion_model->LineItemIsExists($ReqNumber,$MaterialCode);
if(count( $IsExists) == 0) if(count( $IsExists) == 0)
{ {
$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate); $ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate,'MaterialDescription'=>$otherD);
$this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber); $this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber);
} }
else else
{ {
$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate); $ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate,'MaterialDescription'=>$otherD);
$this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode); $this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode);
} }

26
application/controllers/supplier.php
View File

@ -203,12 +203,13 @@ class supplier extends BaseController
{ {
$pan = $this->input->post('panno'); $pan = $this->input->post('panno');
$gst = $this->input->post('GSTNo');
$this->form_validation->set_rules('SupplierName','Supplier Name','trim|required'); $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required');
$this->form_validation->set_rules('Address','Address','trim|required|'); $this->form_validation->set_rules('Address','Address','trim|required|');
$this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]'); $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]');
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
$this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required'); $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required');
$this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); $this->form_validation->set_rules('TIN','TIN','trim|max_length[11]');
if($pan=='') if($pan=='')
{ {
$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]');
@ -217,7 +218,14 @@ class supplier extends BaseController
{ {
$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate');
} }
$this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate'); if($gst=='')
{
$this->form_validation->set_rules('GSTNo','GSTNo','trim|max_length[15]');
}
else
{
$this->form_validation->set_rules('GSTNo','GSTNo','trim|max_length[15]|callback_checkGstValidate');
}
if($this->form_validation->run() == FALSE) if($this->form_validation->run() == FALSE)
{ {
@ -326,13 +334,14 @@ class supplier extends BaseController
function editsupplier() function editsupplier()
{ {
$pan = $this->input->post('panno'); $pan = $this->input->post('panno');
$gst = $this->input->post('GSTNo');
$this->form_validation->set_rules('SupplierName','Supplier Name','trim|required'); $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required');
$this->form_validation->set_rules('Address','Address','trim|required|'); $this->form_validation->set_rules('Address','Address','trim|required|');
$supplierID = $this->input->post('SupplierID'); $supplierID = $this->input->post('SupplierID');
$this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]'); $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]');
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
$this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required'); $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required');
$this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); $this->form_validation->set_rules('TIN','TIN','trim|max_length[11]');
if($pan=='') if($pan=='')
{ {
$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]');
@ -341,9 +350,14 @@ class supplier extends BaseController
{ {
$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier');
} }
if($gst=='')
$this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier'); {
$this->form_validation->set_rules('GSTNo','GSTNo','trim|max_length[15]');
}
else
{
$this->form_validation->set_rules('GSTNo','GSTNo','trim|max_length[15]|callback_checkGstValidateSupplier');
}
if($this->form_validation->run() == FALSE) if($this->form_validation->run() == FALSE)

1573
application/controllers/user.php
View File

File diff suppressed because it is too large Load Diff

7
application/models/dahsboard_model.php
View File

@ -2,7 +2,14 @@
class dahsboard_Model extends CI_Model class dahsboard_Model extends CI_Model
{ {
function getUserCount()
{
$sql="select count(userId) as users FROM tbl_users where isDeleted ='0'";
$query =$this->db->query($sql);
return $query->result();
}
/* HR DASHBOART Model START*/ /* HR DASHBOART Model START*/
function totemp() function totemp()

2
application/models/inwardgateregister_model.php
View File

@ -10,7 +10,7 @@ class inwardgateregister_model extends CI_Model
function igrListing() function igrListing()
{ {
$this->db->select('igr.*,PO.DeliveryDate,sup.SupplierName'); $this->db->select('igr.*,PO.DeliveryDate,sup.SupplierName,igr.file');
$this->db->from('T_IGR_Master igr'); $this->db->from('T_IGR_Master igr');
$this->db->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO'); $this->db->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO');
$this->db->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID'); $this->db->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID');

1
application/models/login_model.php
View File

@ -16,6 +16,7 @@ class Login_model extends CI_Model
$this->db->join('T_Employee_Details as Emp','BaseTbl.EmpID = Emp.EmpID'); $this->db->join('T_Employee_Details as Emp','BaseTbl.EmpID = Emp.EmpID');
$this->db->join('T_DepartmentDetails as DEPT','Emp.Departmentcode = DEPT.DEPCode'); $this->db->join('T_DepartmentDetails as DEPT','Emp.Departmentcode = DEPT.DEPCode');
$this->db->where('BaseTbl.email', $email); $this->db->where('BaseTbl.email', $email);
$this->db->or_where('Emp.ContactNumber', $email);
$this->db->where('BaseTbl.isDeleted', 0); $this->db->where('BaseTbl.isDeleted', 0);
$query = $this->db->get(); $query = $this->db->get();

76
application/models/monthlypay_model.php
View File

@ -10,17 +10,23 @@ class monthlypay_model extends CI_Model
*/ */
function monthlyListing($current="") function monthlyListing($current="")
{ {
$curr_split = explode('-',$current);
$month_val = $curr_split[0];
$year_val = $curr_split[1];
$date_val =cal_days_in_month(CAL_GREGORIAN,$month_val,$year_val);
$lastdate = $year_val.'-'.$month_val.'-'.$date_val;
$this->db->select('T_Monthly_Pay_Inputs.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Payroll.Key,T_Loan_Master.Loan_ID'); $sql="select T_Monthly_Pay_Inputs.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Loan_Master.Loan_ID,T_Payroll.Key
$this->db->from('T_Monthly_Pay_Inputs'); from T_Monthly_Pay_Inputs
$this->db->join('T_Employee_Details','T_Monthly_Pay_Inputs.EmpID=T_Employee_Details.EmpID'); left join T_Employee_Details on T_Monthly_Pay_Inputs.EmpID=T_Employee_Details.EmpID and T_Employee_Details.DateofJoining <= ?
$this->db->join('T_Payroll','T_Monthly_Pay_Inputs.EmpID=T_Payroll.EmpID','left'); left join T_Payroll on T_Monthly_Pay_Inputs.EmpID=T_Payroll.EmpID
$this->db->join('T_Loan_Master','T_Monthly_Pay_Inputs.EmpID=T_Loan_Master.EmpID','left'); left join T_Loan_Master on T_Monthly_Pay_Inputs.EmpID=T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
$this->db->where('Month_Year',$current); where Month_Year = ?
order by T_Employee_Details.EmpID asc";
$query = $this->db->get(); $query = $this->db->query($sql,array($lastdate,$current));
$result = $query->result(); $result = $query->result();
return $result; return $result;
} }
@ -33,15 +39,20 @@ class monthlypay_model extends CI_Model
*/ */
function getEmpPayDetails($current="",$s="") function getEmpPayDetails($current="",$s="")
{ {
$month_val = date('m',strtotime($current));
$year_val = date('Y',strtotime($current));
$date_val =cal_days_in_month(CAL_GREGORIAN,$month_val,$year_val);
$lastdate = $year_val.'-'.$month_val.'-'.$date_val;
$this->db->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining'); $this->db->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining');
$this->db->from('T_Employee_Details'); $this->db->from('T_Employee_Details');
$this->db->where('T_Employee_Details.IsActive',1); $this->db->where('T_Employee_Details.IsActive',1);
$this->db->order_by('EmpID','asc'); $this->db->where('T_Employee_Details.DateofJoining <=',$lastdate);
$query = $this->db->get(); $this->db->order_by('EmpID','asc');
$result = $query->result(); $query = $this->db->get();
$result = $query->result();
return $result;
return $result;
} }
/** /**
@ -53,17 +64,24 @@ class monthlypay_model extends CI_Model
{ {
$current = '01-'.$current; $current = '01-'.$current;
$current = date_create($current); $current = date_create($current);
$current = date_format($current,'Y-m-d'); $current = date_format($current,'Y-m-d');
$sql = "select T_Emp_Pay_Data.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID from T_Emp_Pay_Data
$month_val = date('m',strtotime($current));
$year_val = date('Y',strtotime($current));
$date_val =cal_days_in_month(CAL_GREGORIAN,$month_val,$year_val);
$lastdate = $year_val.'-'.$month_val.'-'.$date_val;
$sql = "select T_Emp_Pay_Data.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID,T_Payroll.Key from T_Emp_Pay_Data
left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID
left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and month(T_Payroll.PayOn) = month(?) and year(T_Payroll.PayOn) = year(?)
left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID
left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1 left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
where T_Employee_Details.DateofJoining <= CURRENT_DATE where T_Employee_Details.DateofJoining <= ?
and month(T_Attendance.Month_Year) = month(?)"; and month(T_Attendance.Month_Year) = month(?) and year(T_Attendance.Month_Year) = year(?)
order by T_Employee_Details.EmpID";
$query = $this->db->query($sql,array($current)); $query = $this->db->query($sql,array($current,$current,$lastdate,$current,$current));
return $query->result(); return $query->result();
} }
@ -151,15 +169,19 @@ class monthlypay_model extends CI_Model
function monthlyAttendance($current="") function monthlyAttendance($current="")
{ {
$this->db->select('T_Attendance.*,T_Employee_Details.FirstName,T_Employee_Details.LastName'); $month_val = date('m',strtotime($current));
$this->db->from('T_Attendance'); $year_val = date('Y',strtotime($current));
$date_val =cal_days_in_month(CAL_GREGORIAN,$month_val,$year_val);
$lastdate = $year_val.'-'.$month_val.'-'.$date_val;
$this->db->select('T_Attendance.*,T_Employee_Details.FirstName,T_Employee_Details.LastName');
$this->db->from('T_Attendance');
$this->db->join('T_Employee_Details','T_Attendance.EmpID=T_Employee_Details.EmpID'); $this->db->join('T_Employee_Details','T_Attendance.EmpID=T_Employee_Details.EmpID');
$this->db->where('T_Employee_Details.DateofJoining <= ',$lastdate);
$this->db->where('Month_Year',$current); $this->db->where('Month_Year',$current);
$this->db->where('T_Employee_Details.IsActive',1);
$query = $this->db->get(); $this->db->order_by('T_Attendance.EmpID', 'asc');
$query = $this->db->get();
$result = $query->result(); $result = $query->result();
return $result; return $result;
} }

17
application/models/payroll_model.php
View File

@ -205,12 +205,15 @@ class Payroll_model extends CI_Model
function getReportforBank($bank,$payon) function getReportforBank($bank,$payon)
{ {
$this->db->distinct();
$this->db->select('Pay.*,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.IFSCCode as IFSC,Bank.Address as BAddress'); $this->db->select('Pay.*,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.IFSCCode as IFSC,Bank.Address as BAddress');
$this->db->from('T_Payroll Pay'); $this->db->from('T_Payroll Pay');
$this->db->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID'); $this->db->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
$this->db->join('T_Bank_Details Bank', 'Emp.BankBranchName = Bank.Bank_name'); $this->db->join('T_Bank_Details Bank', 'Emp.BankBranchName = Bank.Bank_name');
$this->db->where('Emp.BankBranchName',$bank); $this->db->where('Emp.BankBranchName',$bank);
$this->db->where('Pay.PayOn',$payon); $this->db->where('Pay.PayOn',$payon);
$this->db->where('Pay.TotalSalary > 0');
$this->db->order_by("Pay.EmpID", "asc");
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
} }
@ -218,10 +221,14 @@ class Payroll_model extends CI_Model
function getReportforPFESI($payon) function getReportforPFESI($payon)
{ {
$this->db->select('Pay.EmployeeESI,Pay.PF,Pay.CompanyESI,Pay.CompanyPF,Pay.NoofDaysWorked,Pay.OTperHours,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PFNO,Emp.ESI'); $this->db->distinct();
$this->db->from('T_Payroll Pay'); $this->db->select('Pay.EmployeeESI,Pay.PF,Pay.CompanyESI,Pay.CompanyPF,Pay.NoofDaysWorked,Pay.OTperHours,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PFNO,Emp.ESI');
$this->db->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID'); $this->db->from('T_Payroll Pay');
$this->db->where('Pay.PayOn',$payon); $this->db->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
$this->db->where('Pay.PayOn',$payon);
$this->db->where('Pay.EmployeeESI > 0 ');
$this->db->where('Pay.CompanyESI > 0');
$this->db->order_by("Pay.EmpID", "asc");
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
@ -425,7 +432,7 @@ class Payroll_model extends CI_Model
function getCompanyInformation() function getCompanyInformation()
{ {
$subQuery = "select CompanyName,replace(Address,',','<br>') as Address,GSTNO,PAN,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode $subQuery = "select CompanyName,Address,GSTNO,PAN,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode
from T_Company_Details "; from T_Company_Details ";
$query = $this->db->query($subQuery); $query = $this->db->query($subQuery);
//print_r($query->result());die(); //print_r($query->result());die();

28
application/models/purchaseorder_model.php
View File

@ -42,8 +42,8 @@ class purchaseorder_model extends CI_Model
// $this->db->join('T_MaterialMaster mm','mm.MaterialCode = bill.MaterialCode'); // $this->db->join('T_MaterialMaster mm','mm.MaterialCode = bill.MaterialCode');
$this->db->join('T_PurchaseOrder_Master pom','pom.PONO = bill.PONO'); $this->db->join('T_PurchaseOrder_Master pom','pom.PONO = bill.PONO');
$this->db->where('bill.PONO',$pono); $this->db->where('bill.PONO',$pono);
//$this->db->or_where('pom.status',SPECIAL_PO); //$this->db->or_where('pom.status',SPECIAL_PO);
//$this->db->group_by('bill.BillNo'); $this->db->group_by('bill.BillNo');
$query = $this->db->get(); $query = $this->db->get();
@ -717,13 +717,14 @@ function GetPOType($ReqNo)
function GetServicePurchaseOrderDetails($PONO = '') function GetServicePurchaseOrderDetails($PONO = '')
{ {
$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,ReceivedQuantity,Rate,LineItem.Status,(Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount,Dept.DepartmentName $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,LineItem.Quantity,ReceivedQuantity,Rate,LineItem.Status,(LineItem.Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount,Dept.DepartmentName
,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period ,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period,ReqDet.MaterialDescription
FROM T_PurchaseOrder_LineItem LineItem FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID join T_Requestion_Details ReqDet on ReqDet.ReqNo = LineItem.ReqNo and LineItem.MaterialCode = ReqDet.MaterialCode
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode
where LineItem.PONO =?'; where LineItem.PONO =?';
@ -1743,4 +1744,21 @@ function GetRequistionMasterUsingReqNo($Req){
} }
function amendpdf($PONO='')
{
$Amend ='select p.PONO,p.ParentPO,p.Status,p.TotalOrderValue,
m.Status as parentpostatus,
m.TotalOrderValue as partenttotalorder
from T_PurchaseOrder_Master as p
join T_PurchaseOrder_Master as m
on m.PONO = p.ParentPO
where p.PONO = ?';
$amendment = $this->db->query($Amend,array($PONO));
return $amendment->result();
}
} }

18
application/models/quality_model.php
View File

@ -352,7 +352,9 @@ class Quality_model extends CI_Model
$sql = 'select distinct IGRNO from T_IGR_Details $sql = 'select distinct IGRNO from T_IGR_Details
join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode
where T_MaterialMaster.Category like "%Raw Material%" order by IGRNO desc'; where T_MaterialMaster.Category like "%Raw Material%"and date(T_IGR_Details.CreatedDate)
between date(SUBDATE(CURRENT_DATE,1)) and date(CURRENT_DATE)
order by IGRNO desc';
$result = $this->db->query($sql); $result = $this->db->query($sql);
return $result->result(); return $result->result();
} }
@ -373,7 +375,21 @@ class Quality_model extends CI_Model
} }
function getIGRNOReport()
{
$this->db->select('igrno,igrlineitemno');
$this->db->from('T_Test_Report_Master');
$res['generated'] = ($this->db->get()->result());
$sql= 'select distinct IGRNO,IGRItemNo from T_IGR_Details join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode
where (T_IGR_Details.IGRNO not in (select igrno from T_Test_Report_Master where igrno != "")
or T_IGR_Details.IGRItemNo not in (select igrlineitemno from T_Test_Report_Master where igrno != "") )
and T_MaterialMaster.Category like "%Raw Material%"
order by T_IGR_Details.IGRNO DESC';
$r = $this->db->query($sql);
$res['notgenerated'] = ($r->result());
return $res;
}
function getIGRDataforReport($igrno,$igrlineitemno) function getIGRDataforReport($igrno,$igrlineitemno)
{ {

159
application/views/EditservicePurchaseorder.php
View File

@ -173,7 +173,7 @@ foreach ($PaymentTerms as $TER)
<script type="text/javascript"> <script type="text/javascript">
$('#otherdescription').hide();
var insuranceOpt = '<?php echo $InsuranceOptions; ?>'; var insuranceOpt = '<?php echo $InsuranceOptions; ?>';
var DelOpt = '<?php echo $DeliverOption; ?>'; var DelOpt = '<?php echo $DeliverOption; ?>';
@ -347,6 +347,14 @@ $('#MaterialCode').change(function() {
$("#UOM").val(obj.UOM); $("#UOM").val(obj.UOM);
$("#Quantity").val(obj.Quantity); $("#Quantity").val(obj.Quantity);
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
var materialn=obj.MaterialName;
var materialname=materialn.toUpperCase();
if(materialname == 'SERVICE')
{
$('#otherdescription').show();
$('#OtheritemDescription').val(obj.MaterialDescription);
}
} }
}); });
} }
@ -1179,6 +1187,15 @@ $(document).ready(function () {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3" id="otherdescription">
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'OtheritemDescription','value' => set_value('OtheritemDescription'),'id'=>'OtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
@ -1449,6 +1466,17 @@ $(document).ready(function () {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3" id=EditotherDescription>
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditOtheritemDescription','value' => set_value('EditOtheritemDescription'),'id'=>'EditOtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
@ -1722,6 +1750,16 @@ $(document).ready(function () {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3" id="ViewotherDescription">
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'ViewOtheritemDescription','value' => set_value('ViewOtheritemDescription'),'id'=>'ViewOtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
@ -1977,35 +2015,57 @@ $(document).ready(function () {
<td align="right"><?php echo $record->Taxamount ?></td> <td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td> <td align="right"><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td> <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td> <td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->DepartmentName ; ?>" />
<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />
<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
<input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
<input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
<input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
<input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
<input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" />
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" /> <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
<input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
<input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" /> <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->DepartmentName ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
<input type="hidden" name="<?php echo 'OtherAmt'.$index ?>" id="<?php echo 'OtherAmt'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />
<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
<input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
<input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
<input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
<input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
<input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" />
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
<input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
<input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" />
<input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
<input type="hidden" name="<?php echo 'OtherAmt'.$index ?>" id="<?php echo 'OtherAmt'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'OtherServiceDescription'.$index ?>" id="<?php echo 'OtherServiceDescription'.$index ?>" value="<?php echo $record->MaterialDescription ; ?>" />
<?php <?php
@ -2242,7 +2302,8 @@ var userid = '';
$('#EditotherDescription').hide();
$('#otherdescription').hide();
$('.AddService').click(function(){ $('.AddService').click(function(){
@ -2286,7 +2347,7 @@ $('.AddService').click(function(){
var basicval = $("#txtBasicValue").val(); var basicval = $("#txtBasicValue").val();
var otherdesc= $('#OtheritemDescription').val();
var TotalTaxValue = calculateTaxValue(); var TotalTaxValue = calculateTaxValue();
$('#MaterialCode option[value='+materialCode+']').remove(); $('#MaterialCode option[value='+materialCode+']').remove();
@ -2316,10 +2377,10 @@ $('.AddService').click(function(){
addHidden(theForm,"departmentName"+temp,departmentName ); addHidden(theForm,"departmentName"+temp,departmentName );
addHidden(theForm,"AvilBudget"+temp,AvilBudget ); addHidden(theForm,"AvilBudget"+temp,AvilBudget );
addHidden(theForm,"costCode"+temp,costCode ); addHidden(theForm,"costCode"+temp,costCode );
addHidden(theForm,"materialCode"+temp,materialCode ); addHidden(theForm,"materialCode"+temp,materialCode );
addHidden(theForm,"materialName"+temp,materialName ); addHidden(theForm,"materialName"+temp,materialName );
addHidden(theForm,"uom"+temp,uom); addHidden(theForm,"uom"+temp,uom);
addHidden(theForm,"per"+temp,addPer); addHidden(theForm,"per"+temp,addPer);
addHidden(theForm,"quantity"+temp,quantity); addHidden(theForm,"quantity"+temp,quantity);
addHidden(theForm,"itemRate"+temp,itemRate); addHidden(theForm,"itemRate"+temp,itemRate);
addHidden(theForm,"Cgst"+temp,Cgst); addHidden(theForm,"Cgst"+temp,Cgst);
@ -2327,13 +2388,14 @@ $('.AddService').click(function(){
addHidden(theForm,"Sgst"+temp,Sgst); addHidden(theForm,"Sgst"+temp,Sgst);
addHidden(theForm,"AfterSgst"+temp,AfterSgst); addHidden(theForm,"AfterSgst"+temp,AfterSgst);
addHidden(theForm,"Igst"+temp,Igst); addHidden(theForm,"Igst"+temp,Igst);
addHidden(theForm,"AfterIgst"+temp,AfterIgst); addHidden(theForm,"AfterIgst"+temp,AfterIgst);
addHidden(theForm,"Frequency"+temp,Frequency); addHidden(theForm,"Frequency"+temp,Frequency);
addHidden(theForm,"FrequencyValue"+temp,FrequencyValue); addHidden(theForm,"FrequencyValue"+temp,FrequencyValue);
addHidden(theForm,"ItemDescription"+temp,ServiceDescription); addHidden(theForm,"ItemDescription"+temp,ServiceDescription);
addHidden(theForm,"OtherAmt"+temp,OtherAmt); addHidden(theForm,"OtherAmt"+temp,OtherAmt);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue); addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
addHidden(theForm,"LineItemNo"+temp,''); addHidden(theForm,"OtherServiceDescription"+temp,otherdesc);
addHidden(theForm,"LineItemNo"+temp,'');
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
clearServiceModalFields(); clearServiceModalFields();
@ -2544,6 +2606,7 @@ function clearServiceModalFields()
$("#TotalOrderValue ").val(''); $("#TotalOrderValue ").val('');
$("#Frequency").val(''); $("#Frequency").val('');
tinyMCE.get('txtSpcialInstruction').setContent(''); tinyMCE.get('txtSpcialInstruction').setContent('');
$('#OtheritemDescription').val('');
} }
var DeletedMaterialCode=''; var DeletedMaterialCode='';
var DeletedMaterialName=''; var DeletedMaterialName='';
@ -3168,7 +3231,19 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditAfterCgst').val($('#AfterCgst'+userid).val()); $('#EditAfterCgst').val($('#AfterCgst'+userid).val());
$('#EditAfterSgst').val($('#AfterSgst'+userid).val()); $('#EditAfterSgst').val($('#AfterSgst'+userid).val());
$('#EditAfterIgst').val($('#AfterIgst'+userid).val()); $('#EditAfterIgst').val($('#AfterIgst'+userid).val());
if($('#FrequencyValue'+userid).val()==1){ $('#EditOtheritemDescription').val($('#OtherServiceDescription'+userid).val());
var res= $('#OtherServiceDescription'+userid).val();
if(res=='')
{
$('#EditotherDescription').hide();
}
else
{
$('#EditotherDescription').show();
}
if($('#FrequencyValue'+userid).val()==1){
$('#EditFrequency').val($('#Frequency'+userid).val()); $('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val(1); $("#EditFrequencyNo").val(1);
} }
@ -3259,6 +3334,18 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
$('#ViewAfterCgst').val($('#AfterCgst'+userid).val()); $('#ViewAfterCgst').val($('#AfterCgst'+userid).val());
$('#ViewAfterSgst').val($('#AfterSgst'+userid).val()); $('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
$('#ViewAfterIgst').val($('#AfterIgst'+userid).val()); $('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
$('#ViewOtheritemDescription').val($('#OtherServiceDescription'+userid).val());
var res= $('#OtherServiceDescription'+userid).val();
if(res=='')
{
$('#ViewotherDescription').hide();
}
else
{
$('#ViewotherDescription').show();
}
if($('#FrequencyValue'+userid).val()==1){ if($('#FrequencyValue'+userid).val()==1){
$('#ViewFrequency').val($('#Frequency'+userid).val()); $('#ViewFrequency').val($('#Frequency'+userid).val());
$("#ViewFrequencyNo").val(1); $("#ViewFrequencyNo").val(1);

5
application/views/Report_Material_Master_ReceiptValue.php
View File

@ -283,8 +283,9 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'Report - Material Master - ReceiptValue', //title: 'Report - Material Master - ReceiptValue',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }

5
application/views/Report_POreleased.php
View File

@ -390,8 +390,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
title: 'Report - Released PO', title: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Released PO',
//messageTop: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }

70
application/views/Report_consolidate.php
View File

@ -163,48 +163,48 @@
foreach ($spurchse as $result) { ?> foreach ($spurchse as $result) { ?>
<tr> <tr>
<td style="text-align:left;"> <td style="text-align:left;">
<a href="<?= base_url() ?>report/link_purchase?cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a> <a href="<?= base_url() ?>report/link_purchase?sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a>
</td> </td>
<td style="text-align:left;"><?php <td style="text-align:left;"><?php
if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";} if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
?></td> ?></td>
<td style="text-align:right;"><?php $apr= $apr + round($result->April); ?> <td style="text-align:right;"><?php $apr= $apr + round($result->April); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
</td> </td>
<td style="text-align:right;"><?php $may= $may + round($result->May);?> <td style="text-align:right;"><?php $may= $may + round($result->May);?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a></td> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a></td>
<td style="text-align:right;"><?php $jun= $jun + round($result->June);?> <td style="text-align:right;"><?php $jun= $jun + round($result->June);?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a>
</td> </td>
<td style="text-align:right;"><?php $jul= $jul + round($result->July);?> <td style="text-align:right;"><?php $jul= $jul + round($result->July);?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a>
</td> </td>
<td style="text-align:right;"><?php $aug= $aug + round($result->August); ?> <td style="text-align:right;"><?php $aug= $aug + round($result->August); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a>
</td> </td>
<td style="text-align:right;"><?php $sep= $sep + round($result->September); ?> <td style="text-align:right;"><?php $sep= $sep + round($result->September); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a>
</td> </td>
<td style="text-align:right;"><?php $oct= $oct + round($result->October); ?> <td style="text-align:right;"><?php $oct= $oct + round($result->October); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a>
</td> </td>
<td style="text-align:right;"><?php $nov= $nov + round($result->November); ?> <td style="text-align:right;"><?php $nov= $nov + round($result->November); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a>
</td> </td>
<td style="text-align:right;"><?php $dec= $dec + round($result->December); ?> <td style="text-align:right;"><?php $dec= $dec + round($result->December); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a>
</td> </td>
<td style="text-align:right;"><?php $jan= $jan + round($result->January); ?> <td style="text-align:right;"><?php $jan= $jan + round($result->January); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a>
</td> </td>
<td style="text-align:right;"><?php $feb= $feb + round($result->February); ?> <td style="text-align:right;"><?php $feb= $feb + round($result->February); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a>
</td> </td>
<td style="text-align:right;"><?php $mar= $mar + round($result->March); ?> <td style="text-align:right;"><?php $mar= $mar + round($result->March); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a>
</td> </td>
<td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?> <td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a>
</td> </td>
</tr> </tr>
@ -393,49 +393,49 @@
foreach ($spurchse as $result) { ?> foreach ($spurchse as $result) { ?>
<tr> <tr>
<td style="text-align:left;"> <td style="text-align:left;">
<a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>"><?php echo $result->supplier_name;?> </a> <a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo $result->supplier_name;?> </a>
</td> </td>
<td style="text-align:left;"><?php <td style="text-align:left;"><?php
if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";} if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
?></td> ?></td>
<td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?> <td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?> <td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?> <td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?> <td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?> <td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?> <td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?> <td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?> <td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?> <td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?> <td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?> <td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?> <td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?> <td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?>
<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a> <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
</td> </td>
</tr> </tr>
@ -617,8 +617,9 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT-Consolidate(Quantity)', //title: 'REPORT-Consolidate(Quantity)',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }
@ -635,13 +636,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate(Value)',
title: $('h3').text(),
title: 'REPORT-Consolidate(Value)',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

74
application/views/Report_consolidate_inward.php
View File

@ -180,49 +180,49 @@
foreach ($spurchse as $result) { ?> foreach ($spurchse as $result) { ?>
<tr> <tr>
<td style="text-align:left;"> <td style="text-align:left;">
<a href="<?= base_url() ?>report/ilink_purchase?cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a> <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a>
</td> </td>
<td style="text-align:left;"><?php <td style="text-align:left;"><?php
if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";} if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
?></td> ?></td>
<td style="text-align:right;"><?php $apr= $apr + round($result->April); ?> <td style="text-align:right;"><?php $apr= $apr + round($result->April); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
</td> </td>
<td style="text-align:right;"><?php $may= $may + round($result->May); ?> <td style="text-align:right;"><?php $may= $may + round($result->May); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a>
</td> </td>
<td style="text-align:right;"><?php $jun= $jun + round($result->June); ?> <td style="text-align:right;"><?php $jun= $jun + round($result->June); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a>
</td> </td>
<td style="text-align:right;"><?php $jul= $jul + round($result->July); ?> <td style="text-align:right;"><?php $jul= $jul + round($result->July); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a>
</td> </td>
<td style="text-align:right;"><?php $aug= $aug + round($result->August); ?> <td style="text-align:right;"><?php $aug= $aug + round($result->August); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a>
</td> </td>
<td style="text-align:right;"><?php $sep= $sep + round($result->September); ?> <td style="text-align:right;"><?php $sep= $sep + round($result->September); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a>
</td> </td>
<td style="text-align:right;"><?php $oct= $oct + round($result->October); ?> <td style="text-align:right;"><?php $oct= $oct + round($result->October); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a>
</td> </td>
<td style="text-align:right;"><?php $nov= $nov + round($result->November); ?> <td style="text-align:right;"><?php $nov= $nov + round($result->November); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a>
</td> </td>
<td style="text-align:right;"><?php $dec= $dec + round($result->December); ?> <td style="text-align:right;"><?php $dec= $dec + round($result->December); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a>
</td> </td>
<td style="text-align:right;"><?php $jan= $jan + round($result->January); ?> <td style="text-align:right;"><?php $jan= $jan + round($result->January); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a>
</td> </td>
<td style="text-align:right;"><?php $feb= $feb + round($result->February); ?> <td style="text-align:right;"><?php $feb= $feb + round($result->February); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a>
</td> </td>
<td style="text-align:right;"><?php $mar= $mar + round($result->March); ?> <td style="text-align:right;"><?php $mar= $mar + round($result->March); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
</td> </td>
<td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?> <td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?>
<a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>"><?php echo round($result->qtotal);?> </a> <a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a>
</td> </td>
</tr> </tr>
@ -414,7 +414,7 @@
foreach ($spurchse as $result) { ?> foreach ($spurchse as $result) { ?>
<tr> <tr>
<td style="text-align:left;"> <td style="text-align:left;">
<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>"><?php echo $result->supplier_name;?> </a> <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo $result->supplier_name;?> </a>
</td> </td>
<td style="text-align:left;"><?php <td style="text-align:left;"><?php
@ -423,55 +423,55 @@
</td> </td>
<td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?> <td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?> <td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?> <td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?> <td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?> <td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?> <td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?> <td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?> <td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?> <td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?> <td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?> <td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?> <td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a>
</td> </td>
<td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?> <td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?>
<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&cname=<?php echo $result->supplier_name;?>&prod=<?php echo $result->material_name;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a> <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
</td> </td>
</tr> </tr>
@ -649,13 +649,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate(Quantity)',
title: $('h3').text(),
title: 'REPORT-Consolidate(Quantity)',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
@ -677,13 +674,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate(Value)',
title: $('h3').text(),
title: 'REPORT-Consolidate(Value)',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

7
application/views/Report_consolidate_m.php
View File

@ -77,7 +77,7 @@ if(!empty($mms))
<tr> <tr>
<td><span> <td><span>
<a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab;?>&cname=<?php echo $rel->supplier_name;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a> <a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?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
@ -171,8 +171,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT-Consolidate', //title: 'REPORT-Consolidate',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_consolidate_month.php
View File

@ -181,13 +181,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate month-Wise',
title: $('h3').text(),
title: 'REPORT-Consolidate month-Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

8
application/views/Report_consolidate_month_inward.php
View File

@ -77,7 +77,8 @@ if(!empty($mms))
<tr> <tr>
<td><span> <td><span>
<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cname=<?php echo $rel->supplier_name;?>&prod=<?php echo $rel->material_name;?>&month=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a>
<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?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
@ -171,8 +172,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT - Consolidate Inward', //title: 'REPORT - Consolidate Inward',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

18
application/views/Report_consolidate_raw.php
View File

@ -692,13 +692,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate-Category(Quantity)',
title: $('h3').text(),
title: 'REPORT-Consolidate-Category(Quantity)',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
@ -720,13 +717,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate-Category(Quantity)',
title: $('h3').text(),
title: 'REPORT-Consolidate-Category(Quantity)',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

8
application/views/Report_consolidate_y.php
View File

@ -77,7 +77,8 @@ if(!empty($mms))
<tr> <tr>
<td><span> <td><span>
<a href="<?= base_url() ?>report/link_purchase?cname=<?php echo $rel->supplier_name;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?> </a>
<a href="<?= base_url() ?>report/link_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?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>
@ -172,8 +173,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT-Consolidate', //title: 'REPORT-Consolidate',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_consolidate_year.php
View File

@ -182,13 +182,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Consolidate Category-Wise',
title: $('h3').text(),
title: 'REPORT-Consolidate Category-Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

7
application/views/Report_consolidate_year_inward.php
View File

@ -79,7 +79,7 @@ if(!empty($mms))
<tr> <tr>
<td><span> <td><span>
<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cname=<?php echo $rel->supplier_name;?>&prod=<?php echo $rel->material_name;?>"><?php echo $rel->supplier_name;?> </a> <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>"><?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
@ -173,8 +173,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT - Consolidate Inward', //title: 'REPORT - Consolidate Inward',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

20
application/views/Report_costcenter.php
View File

@ -157,31 +157,19 @@ if(!empty($ccrpt))
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-CostCentre',
title: $('h3').text(),
title: 'REPORT-CostCentre',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }
}, },
'colvis' 'colvis'
] ]

19
application/views/Report_cumulative.php
View File

@ -259,22 +259,14 @@ $(document).ready(function() {
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [ buttons: [ {
{
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative',
title: $('h3').text(),
title: 'REPORT-Cumulative',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
@ -282,10 +274,7 @@ buttons: [
}, },
'colvis' 'colvis'
] ]
} ); } );

10
application/views/Report_cumulative_day.php
View File

@ -161,15 +161,11 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative',
title: $('h3').text(),
title: 'REPORT-Cumulative',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }

10
application/views/Report_cumulative_day_inward.php
View File

@ -162,15 +162,11 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative Day Inward',
title: $('h3').text(),
title: 'REPORT-Cumulative Day Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }

12
application/views/Report_cumulative_day_raw.php
View File

@ -172,24 +172,18 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative Day',
title: $('h3').text(),
title: 'REPORT-Cumulative Day',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }
}, },
'colvis' 'colvis'
] ]
} ); } );
} ); } );
$('#mySelect').on('change',function(){ $('#mySelect').on('change',function(){

9
application/views/Report_cumulative_inward.php
View File

@ -260,13 +260,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Inward',
title: $('h3').text(),
title: 'REPORT-Cumulative-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_month.php
View File

@ -170,13 +170,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative Month',
title: $('h3').text(),
title: 'REPORT-Cumulative Month',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_month_inward.php
View File

@ -169,13 +169,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative Month-Inward',
title: $('h3').text(),
title: 'REPORT-Cumulative Month-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_month_raw.php
View File

@ -198,13 +198,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Category Wise',
title: $('h3').text(),
title: 'REPORT-Cumulative-Category Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_raw.php
View File

@ -269,13 +269,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Category Wise',
title: $('h3').text(),
title: 'REPORT-Cumulative-Category Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_year.php
View File

@ -192,13 +192,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Year',
title: $('h3').text(),
title: 'REPORT-Cumulative-Year',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_year_inward.php
View File

@ -192,13 +192,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Year-Inward',
title: $('h3').text(),
title: 'REPORT-Cumulative-Year-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_cumulative_year_raw.php
View File

@ -203,13 +203,10 @@ $(document).ready(function() {
buttons: [ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'REPORT-Cumulative-Year - Category Wise',
title: $('h3').text(),
title: 'REPORT-Cumulative-Year - Category Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_month_wise.php
View File

@ -150,13 +150,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Month Wise',
title: $('h3').text(),
title: 'Report - Month Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_month_wise_inward.php
View File

@ -149,13 +149,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Month Wise Inward',
title: $('h3').text(),
title: 'Report - Month Wise Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_openorder.php
View File

@ -359,13 +359,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Open Order-Pending',
title: $('h3').text(),
title: 'Report - Open Order-Pending',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

5
application/views/Report_pending_purchase.php
View File

@ -407,8 +407,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), //messageTop: $('h3').text(),
title: 'REPORT-Pending Purchase Order', //title: 'REPORT-Pending Purchase Order',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

15
application/views/Report_purchase.php
View File

@ -318,7 +318,7 @@ if(!empty($mms))
<td><strong>&nbsp</strong></td> <td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td> <td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td> <td><strong>&nbsp</strong></td>
<td><strong>&nbsp</strong></td>
<td class="amount" style="text-align:right"><strong> <td class="amount" style="text-align:right"><strong>
<?php <?php
@ -337,6 +337,14 @@ if(!empty($mms))
} }
?> ?>
</strong> </strong>
</td>
<td class="amount"><strong>
<?php
{
//echo format_currency($tot_rate,2,'.','');
}
?>
</strong>
</td> </td>
<td class="amount"><strong> <td class="amount"><strong>
<?php <?php
@ -482,8 +490,9 @@ $(document).ready(function() {
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
messageTop: $('h3').text(), messageTop:'Report Purchase',
title: 'Report - Purchase', //title: 'Report - Purchase',
title: $('h3').text(),
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_purchase_inward.php
View File

@ -510,13 +510,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), messageTop: 'Report Purchase-Inward',
title: $('h3').text(),
title: 'Report - Purchase-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_supplier.php
View File

@ -339,13 +339,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Supplier-Wise',
title: $('h3').text(),
title: 'Report - Supplier-Wise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_supplier_inward.php
View File

@ -339,13 +339,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Supplier-Wise-Inward',
title: $('h3').text(),
title: 'Report - Supplier-Wise-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_totalorders.php
View File

@ -162,13 +162,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - TotalOrders',
title: $('h3').text(),
title: 'Report - TotalOrders',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

9
application/views/Report_year_wise.php
View File

@ -219,13 +219,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - YearWise',
title: $('h3').text(),
title: 'Report - YearWise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

19
application/views/Report_year_wise_inward.php
View File

@ -115,9 +115,9 @@ if(!empty($mms))
<td style="text-align:center"><span> <td style="text-align:center"><span>
<?php <?php
$date = strtotime($rel->created_date); $da = strtotime($rel->CreatedDate);
$new = date('M-y', $date); $new = date('M-y', $da);
$pass = date('Y-m-d',$date); $pass = date('Y-m-d',$da);
$ab=$this->input->post('financialyear'); $ab=$this->input->post('financialyear');
//echo $new; //echo $new;
?> ?>
@ -128,8 +128,8 @@ if(!empty($mms))
$tr3= $tr3 + $rel->quantity; $tr3= $tr3 + $rel->quantity;
echo round($rel->quantity);?></span></td> echo round($rel->quantity);?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php
$tr4= $tr4 + number_format($rel->total,2,'.',''); $tr4= $tr4 + number_format($rel->value,2,'.','');
echo number_format($rel->total,2,'.','');?></span></td> echo number_format($rel->value,2,'.','');?></span></td>
@ -210,13 +210,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - YearWise',
title: $('h3').text(),
title: 'Report - YearWise',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

11
application/views/Report_year_wise_total.php
View File

@ -151,22 +151,17 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
title: $('h3').text(),
messageTop: $('h3').text(), //messageTop: $('h3').text(),
//title: 'Report - YearWise-Total',
title: 'Report - YearWise-Total',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'
} }
}, },
'colvis' 'colvis'
] ]
} ); } );
} ); } );

9
application/views/Report_year_wise_total_inward.php
View File

@ -150,13 +150,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - YearWise-Total-Inward',
title: $('h3').text(),
title: 'Report - YearWise-Total-Inward',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

30
application/views/addsupplier.php
View File

@ -405,8 +405,8 @@ $(function() {
<span for="PAN">PAN</span> <!--<span class="badge">*</span>--> <span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
<input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alpha(event)" style="text-transform: uppercase"> </div> <input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alpha(event)" style="text-transform: uppercase"> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><!--<span class="badge">*</span>-->
<input type="text" class="form-control required" pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return isNumberKey(event)" required title="Please Enter 11 digit Number"> <input type="text" class="form-control" pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="UANumber">UA Number</span> <span for="UANumber">UA Number</span>
@ -429,8 +429,8 @@ $(function() {
<input id="dateofCST" name="dateofCST" onkeypress="return false;" maxlength="10" class="form-control"> <input id="dateofCST" name="dateofCST" onkeypress="return false;" maxlength="10" class="form-control">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">GST Number</span><span class="badge">*</span> <span for="GSTNo">GST Number</span><!--<span class="badge">*</span> -->
<input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" required onchange="validateGST();" style="text-transform:uppercase;" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alpha(event)"> <input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" onchange="validateGST();" style="text-transform:uppercase;" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alpha(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="Range">GST Range</span><!--<span class="badge">*</span>--> <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
@ -603,17 +603,17 @@ if($("#Address").val().length < 1)
return false; return false;
} }
if($("#TIN").val().length < 1) // if($("#TIN").val().length < 1)
{ // {
swal('Please Enter TIN number'); // swal('Please Enter TIN number');
$("#TIN").focus(); // $("#TIN").focus();
return false; // return false;
} // }
if(!validateGST()) // if(!validateGST())
{ // {
$('#GSTNo').focus(); // $('#GSTNo').focus();
return false; // return false;
} // }
if(!validateEmail()) if(!validateEmail())
{ {

19
application/views/capitalpopdf.php
View File

@ -1,6 +1,6 @@
<?php <?php
$TotalCgst1='-'; $TotalCgst1='-';
$PONO = ''; $PONO = '';
$postatus =''; $postatus ='';
$CompanyAddress = ''; $CompanyAddress = '';
$CompanyName = ''; $CompanyName = '';
@ -19,7 +19,7 @@
$PaymentOtherDescription=''; $PaymentOtherDescription='';
$DeliverySchedule=''; $DeliverySchedule='';
$advance=0; $advance=0;
$finCap=''; $finCap='';
$modShp=''; $modShp='';
$insNo=''; $insNo='';
$insNo=''; $insNo='';
@ -261,7 +261,6 @@
<?php <?php
if(!empty($POItem)) if(!empty($POItem))
{ {
foreach($POItem as $v) foreach($POItem as $v)
{ {
if(!empty($v->AmendedDetails)) if(!empty($v->AmendedDetails))
@ -275,8 +274,8 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><strong>Item Description</strong></td> <td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td> <td style="text-align: center;" rowspan="2"><strong>Current Details</strong></td>
<td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td> <td style="text-align: center;" rowspan="2" ><strong>Revised Details</strong></td>
</tr> </tr>
<?php if(!empty($POItem)) <?php if(!empty($POItem))
{ {
@ -284,9 +283,15 @@
{ {
if(!empty($record->lineamd)){ if(!empty($record->lineamd)){
echo $record->lineamd ; echo $record->lineamd ;
}
} }
} ?> }
}
?>
<tr>
<td style="text-align: center;"><strong>Total</strong></td>
<td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
<td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
</tr>
</tbody> </tbody>
</table> </table>
<?php } ?> <?php } ?>

183
application/views/dashboard.php
View File

@ -48,13 +48,38 @@ if(!empty($EmpCount))
<?php <?php
} }
?> ?>
<!-- HR Start part to-->
<!-- HR Start part to-->
<script>
$( function()
{
$('#datepick').datepicker({maxDate: 'Date-1', dateFormat: 'dd-mm-yy' }).datepicker('setDate',new Date());
} );
</script>
<script type="text/javascript">
$(document).ready(function()
{
//$("#employee").select2();
//$("#employeeAttan").select2();
$("#emp").select2();
});
</script>
<style> <style>
.small-box .icon { .small-box .icon
top: 0px !important; {
} top: 0px !important;
</style> }
</style>
<?php <?php
if($DEPCode == HR) if($DEPCode == HR)
{ {
@ -62,7 +87,7 @@ if(!empty($EmpCount))
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<!-- <center><h1> HR Department Dashboard</h1> </center> -->
</section> </section>
<!-- Main content --> <!-- Main content -->
<section class="content"> <section class="content">
@ -147,13 +172,14 @@ if(!empty($EmpCount))
<div class="col-lg-3 col-xs-6"> <div class="col-lg-3 col-xs-6">
<!-- small box --> <!-- small box -->
<div class="small-box bg-yellow"> <div class="small-box bg-yellow" >
<a target="_blank" href="<?php echo base_url(); ?>loanreports" class="small-box-footer"> <p> <strong>SALARY COST</strong> </p> </a> <a class="small-box-footer"> <p><strong>SALARY COST</strong></p></a>
<div class="inner"> <div class="inner" style="padding: 14px;">
<h3 id=""><i class="fa fa-rupee"></i><?php echo $employeeSalary;?></h3> <h3 ><div class="fa fa-rupee" id="today_salary" style="font-size:bold"> <b><?php echo $employeeSalary;?></b>
<p>TODAY</p> </div></h3>
<input type="text" id="datepick" placeholder="Select Date" style="color:#000;width:30%" />
</div> </div>
@ -161,7 +187,7 @@ if(!empty($EmpCount))
<i class="ion ion-calculator"></i> <i class="ion ion-calculator"></i>
</div> </div>
<a class="small-box-footer"> THIS MONTH : <i class="fa fa-rupee"></i> <?php echo $totalSalary;?> <a class="small-box-footer" style="z-index:0;"> THIS MONTH : <i class="fa fa-rupee"></i> <?php echo $totalSalary;?>
</a> </a>
</div> </div>
@ -176,18 +202,19 @@ if(!empty($EmpCount))
<div class="small-box bg-green"> <div class="small-box bg-green">
<a href="#" class="small-box-footer"> <p> <strong>TOTAL EMPLOYEES ABSENT</strong> </p></a> <a href="#" class="small-box-footer"> <p> <strong>TOTAL EMPLOYEES ABSENT</strong> </p></a>
<h3>
<div class="inner"> <div class="inner" id="today_abs" >
<h3> <?php echo $today;?></h3> <h3> <?php echo $today;?></h3>
<p>TODAY</p>
</div>
</div></h3>
<p>ABSENT</p><br>
<div class="icon"> <div class="icon">
<i class="ion ion-android-calendar"></i> <i class="ion ion-android-calendar"></i>
</div> </div> <a href="#" class="small-box-footer"><br> </a>
<a href="#" class="small-box-footer">YESTERDAY :<?php echo $values;?> </a>
</div> </div>
</div> </div>
<!-- ./col --> <!-- ./col -->
@ -227,7 +254,15 @@ if(!empty($EmpCount))
</h3> </h3>
<!-- <input type="text" id="datepic" name="datepic" placeholder="Select Date" style="color:#000;width:15%" /> -->
<!-- <input type="button" id="but" value="ok" style="color:blue; width:15%" /> -->
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
@ -246,13 +281,13 @@ if(!empty($EmpCount))
<h5 class="description-header">Working Days</h5> <h5 class="description-header">Working Days</h5>
</div> </div>
<!-- /.description-block -->
<div class="description-block margin-bottom"> <div class="description-block margin-bottom">
<h3 id="worked"><b>0</b></h3> <h3 id="worked"><b>0</b></h3>
<h5 class="description-header">Days Present</h5> <h5 class="description-header">Days Present</h5>
</div> </div>
<!-- /.description-block -->
</div> </div>
</div> </div>
@ -282,11 +317,12 @@ if(!empty($EmpCount))
chart.draw(data, options); chart.draw(data, options);
$('#emp').change(function() { $('#emp').change(function() {
//var datepick = $('#datepic').val();
var id = $('#emp').val(); var id = $('#emp').val();
$("#yearabs").val(''); $("#yearabs").val('');
if(id != '-1') if(id != 0)
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -297,7 +333,7 @@ if(!empty($EmpCount))
url:"<?php echo base_url();?>user/attendanceyear", url:"<?php echo base_url();?>user/attendanceyear",
success:function(json) { success:function(json) {
console.log(json); console.log(json);
// alert(json.workeds);
$('#content').loader('hide'); $('#content').loader('hide');
$('#totaldays').text(json.totaldays); $('#totaldays').text(json.totaldays);
$('#worked').text(json.workeds) $('#worked').text(json.workeds)
@ -307,16 +343,22 @@ if(!empty($EmpCount))
chart.draw(data, options); chart.draw(data, options);
}, },
error:function(){ // error:function(){
swal('error');
} // }
}); });
} }
else else
{ {
swal('Please select the Employee'); alert('Please select the Employee');
$('#totaldays').text(0);
$('#worked').text(0);
$("#yeardata").text(0);
data.setValue(0, 1, 0);
chart.draw(data, options);
return false; return false;
} }
@ -325,15 +367,7 @@ if(!empty($EmpCount))
</script> </script>
<script type="text/javascript"> <!------ Month------>
$(document).ready(function(){
$("#employee").select2();
$("#employeeAttan").select2();
$("#emp").select2();
});
</script>
<!-- Month -->
<div class="col-md-6 col-sm-6" style="padding:0px;"> <div class="col-md-6 col-sm-6" style="padding:0px;">
<div class="col-md-7 col-sm-7"> <div class="col-md-7 col-sm-7">
@ -354,6 +388,7 @@ if(!empty($EmpCount))
<h5 class="description-header">Days Present</h5> <h5 class="description-header">Days Present</h5>
</div> </div>
<!-- /.description-block --> <!-- /.description-block -->
</div> </div>
@ -372,7 +407,7 @@ if(!empty($EmpCount))
<!-- Start of List of employees absent--> <!-- Start of List of employees absent-->
<div class="col-md-3"> <div class="col-md-3">
<!-- DIRECT CHAT -->
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">NAME OF ABSENTEES</h3> <h3 class="box-title">NAME OF ABSENTEES</h3>
@ -388,13 +423,21 @@ if(!empty($EmpCount))
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<!-- Conversations are loaded here --> <!-- Conversations are loaded here -->
<div class="direct-chat-messages"> <div class="direct-chat-messages" >
<!-- Message. Default to the left --> <!-- Message. Default to the left -->
<div class="inner" id ="abs_name">
<!-- <h3> <?php echo $abs_name;?></h3>
-->
</div>
<?php <?php
if(!empty($absname)){ if(!empty($abs_name)){
foreach ($absname as $abs) { foreach ($abs_name as $abs) {
echo $abs.'<br/>'; echo $abs.'<br/>';
?> ?>
<?php } <?php }
@ -462,11 +505,12 @@ if(!empty($EmpCount))
$('#emp').change(function() { $('#emp').change(function() {
// alert();
var id = $('#emp').val(); var id = $('#emp').val();
$("#monthabs").val(''); $("#monthabs").val('');
if(id != '-1') if(id != 0)
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -479,28 +523,27 @@ $("#monthabs").val('');
console.log(json); console.log(json);
$('#content').loader('hide'); $('#content').loader('hide');
//alert(json.MatDetail);
$("#present").text(json.values); $("#present").text(json.values);
$("#total_days").text(json.CUR_month); $("#total_days").text(json.CUR_month);
$("#salaryInCurrentday").text(json.salaryInCurrentday);
data.setValue(0, 1, json.present_percentage); data.setValue(0, 1, json.present_percentage);
chart.draw(data, options); chart.draw(data, options);
//setTimeout(getData, 1000);
} }
}); });
//$('#content').loader('hide');
} }
else else
{ {
swal('Please select the Employee');
$("#present").text(0);
$("#total_days").text(0);
data.setValue(0, 1, 0);
chart.draw(data, options);
return false; return false;
} }
@ -512,6 +555,44 @@ $("#monthabs").val('');
</script>
<script>
$('#datepick').change(function() {
$('#abs_name').empty();
var id = $(this).val();
$.ajax({
data:{id:id},
dataType: 'json',
type:"POST",
url:"<?php echo base_url();?>user/dateFunctionChangeVales",
success:function(json) {
var abs_name = json.absname;
$.each(abs_name,function(i,obj){
$("#abs_name").append(obj+'<br/>');
});
$("#today_abs").text(json.today);
$("#values").text(json.values);
$("#today_salary").text(json.employeeSalary);
}
});
});
</script> </script>

100
application/views/editServiceAmendPO.php Normal file → Executable file
View File

@ -1151,7 +1151,17 @@ $(document).ready(function () {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="col-md-3" id=EditotherDescription>
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditOtheritemDescription','value' => set_value('EditOtheritemDescription'),'id'=>'EditOtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1389,59 +1399,89 @@ $(document).ready(function () {
} }
?> ?>
<tr id="<?php echo $index ; ?>"> <tr id="<?php echo $index ; ?>">
<td align="left"><?php echo $index ; ?></td> <td align="left"><?php echo $index ; ?></td>
<td><?php echo $record->ReqNo ?></td> <td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialCode ?></td> <td><?php echo $record->MaterialCode ?></td>
<td><?php echo $record->ServiceMaterialDescription ?></td> <td><?php echo $record->ServiceMaterialDescription ?></td>
<td align="right"><?php echo $record->Quantity ?></td> <td align="right"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td>
<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
<td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<td align="right"><?php echo $record->Rate ?></td>
<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td> <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" /> <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />
<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" /> <input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />
<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
<input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" /> <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
<input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" /> <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
<input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" /> <input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
<input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" /> <input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
<input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" /> <input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" />
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'beforequantity'.$index ?>" id="<?php echo 'beforequantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" /> <input type="hidden" name="<?php echo 'beforequantity'.$index ?>" id="<?php echo 'beforequantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" /> <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<input type="hidden" name="<?php echo 'beforeitemRate'.$index ?>" id="<?php echo 'beforeitemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" /> <input type="hidden" name="<?php echo 'beforeitemRate'.$index ?>" id="<?php echo 'beforeitemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" /> <input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeCgst'.$index ?>" id="<?php echo 'beforeCgst'.$index ?>" value="<?php echo $record->CGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeCgst'.$index ?>" id="<?php echo 'beforeCgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" /> <input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeCgstvalue'.$index ?>" id="<?php echo 'beforeCgstvalue'.$index ?>" value="<?php echo $record->After_CGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeCgstvalue'.$index ?>" id="<?php echo 'beforeCgstvalue'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
<input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" /> <input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeSgst'.$index ?>" id="<?php echo 'beforeSgst'.$index ?>" value="<?php echo $record->SGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeSgst'.$index ?>" id="<?php echo 'beforeSgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" /> <input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeSgstvalue'.$index ?>" id="<?php echo 'beforeSgstvalue'.$index ?>" value="<?php echo $record->After_SGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeSgstvalue'.$index ?>" id="<?php echo 'beforeSgstvalue'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
<input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" /> <input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeIgst'.$index ?>" id="<?php echo 'beforeIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeIgst'.$index ?>" id="<?php echo 'beforeIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" /> <input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'beforeIgstvalue'.$index ?>" id="<?php echo 'beforeIgstvalue'.$index ?>" value="<?php echo $record->After_IGST ; ?>" /> <input type="hidden" name="<?php echo 'beforeIgstvalue'.$index ?>" id="<?php echo 'beforeIgstvalue'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" /> <input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" /> <input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" /> <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'servicematerialdescription'.$index ?>" id="<?php echo 'servicematerialdescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" /> <input type="hidden" name="<?php echo 'servicematerialdescription'.$index ?>" id="<?php echo 'servicematerialdescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" /> <input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" />
<input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" /> <input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'OtherServiceDescription'.$index ?>" id="<?php echo 'OtherServiceDescription'.$index ?>" value="<?php echo $record->MaterialDescription ; ?>" />
<?php <?php
@ -1614,7 +1654,7 @@ var userid = '';
}; };
$('#EditotherDescription').hide();
$("#EDITSERVICE").on("shown.bs.modal", function(e) { $("#EDITSERVICE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount?>'; var AvlBudAmt = '<?php echo $AvlAmount?>';
@ -1646,7 +1686,19 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditAfterSgst').val($('#AfterSgst'+userid).val()); $('#EditAfterSgst').val($('#AfterSgst'+userid).val());
$('#EditAfterIgst').val($('#AfterIgst'+userid).val()); $('#EditAfterIgst').val($('#AfterIgst'+userid).val());
$('#otherallowance').val($('#otherallowance'+userid).val()); $('#otherallowance').val($('#otherallowance'+userid).val());
$('#EditOtheritemDescription').val($('#OtherServiceDescription'+userid).val());
var res= $('#OtherServiceDescription'+userid).val();
if(res=='')
{
$('#EditotherDescription').hide();
}
else
{
$('#EditotherDescription').show();
}
if($('#FrequencyValue'+userid).val()==1){ if($('#FrequencyValue'+userid).val()==1){
$('#EditFrequency').val($('#Frequency'+userid).val()); $('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val(1); $("#EditFrequencyNo").val(1);

30
application/views/editSupplier.php
View File

@ -501,8 +501,8 @@ function onlyAlphabets(evt) {
<input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alpha(event)" style="text-transform:uppercase;"> <input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alpha(event)" style="text-transform:uppercase;">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><!--<span class="badge">*</span>-->
<input type="text" class="form-control required" value="<?php echo $TIN;?>" pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number"> <input type="text" class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="UANumber">UA Number</span> <span for="UANumber">UA Number</span>
@ -525,9 +525,9 @@ function onlyAlphabets(evt) {
<input id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>" onkeypress="return false;" maxlength="10" class="form-control"> <input id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>" onkeypress="return false;" maxlength="10" class="form-control">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="GSTNo">GST Number</span><span class="badge">*</span> <span for="GSTNo">GST Number</span><!--<span class="badge">*</span>-->
<!-- <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alpha(event)"> --> <!-- <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alpha(event)"> -->
<input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alpha(event)"> <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15" class="form-control" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alpha(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
@ -707,17 +707,17 @@ if($("#Address").val().length < 1)
return false; return false;
} }
if($("#TIN").val().length < 1) // if($("#TIN").val().length < 1)
{ // {
swal('Please Enter TIN number'); // swal('Please Enter TIN number');
$("#TIN").focus(); // $("#TIN").focus();
return false; // return false;
} // }
if(!validateGST()) // if(!validateGST())
{ // {
$('#GSTNo').focus(); // $('#GSTNo').focus();
return false; // return false;
} // }
} }

77
application/views/editrequisitionform.php
View File

@ -33,6 +33,7 @@ if(!empty($ReqDetails))
} }
} }
$description='';
if(!empty($ReqPOType)) if(!empty($ReqPOType))
{ {
@ -297,6 +298,17 @@ if(!empty($ReqPOType))
?> ?>
</div> </div>
</div> </div>
<div class="col-md-6" id="otherDescription" >
<label>Other Description</label>
<div class="form-group">
<?php
$data = array('name' => 'otherD','value' => set_value('otherD'),'id'=>'otherD', 'class' => 'form-control' ,'rows' => '5', 'cols' => '70','maxlength' => '500');
echo Form_textarea($data);
?>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label>UOM</label> <label>UOM</label>
<div> <div>
@ -360,6 +372,16 @@ if(!empty($ReqPOType))
?> ?>
</div> </div>
</div> </div>
<div class="col-md-6" id="EditotherDescription">
<label>Other Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditotherD','value' => set_value('EditotherD'),'id'=>'EditotherD', 'class' => 'form-control' ,'rows' => '5', 'cols' => '70','maxlength' => '500');
echo Form_textarea($data);
?>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label>UOM</label> <label>UOM</label>
<div> <div>
@ -417,6 +439,7 @@ if(!empty($ReqPOType))
foreach($LineItem as $record) foreach($LineItem as $record)
{ {
$index = $index + 1; $index = $index + 1;
$materialdesc=$record->MaterialDescription;
?> ?>
<tr id="<?php echo $index ; ?>"> <tr id="<?php echo $index ; ?>">
<td align="left"><?php echo $index ; ?></td> <td align="left"><?php echo $index ; ?></td>
@ -425,12 +448,12 @@ if(!empty($ReqPOType))
<td align="left"><?php echo $record->MaterialCode ; ?></td> <td align="left"><?php echo $record->MaterialCode ; ?></td>
<td align="left"><?php echo $record->MaterialName ; ?></td> <td align="left"><?php echo $record->MaterialName ; ?></td>
<td align="left"><?php echo $record->UOM ; ?></td> <td align="left"><?php echo $record->UOM ; ?></td>
<td align="left"><?php echo $record->Quantity ; ?></td> <td align="left"><?php echo $record->Quantity ; ?></td>
<td align="left"><?php echo $record->POQTY ; ?></td> <td align="left"><?php echo $record->POQTY ; ?></td>
<td align="left"><?php echo $record->StatusName ;?></td> <td align="left"><?php echo $record->StatusName ;?></td>
<input type="text" name="<?php echo 'materialdesc'.$index ?>" id="<?php echo 'materialdesc'.$index ?>" value="<?php echo $record->MaterialDescription ; ?>" />
<td> <td>
<a data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-target='#EditItem' data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a> <a data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-target='#EditItem' data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
@ -511,6 +534,8 @@ $(function() {
}); });
$('#otherDescription').hide();
$('#EditotherDescription').hide();
$( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' }); $( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
//Initialize Select2 Elements //Initialize Select2 Elements
@ -616,8 +641,13 @@ $('#drpMaterial').change(function() {
$("#Description").val(''); $("#Description").val('');
$("#UOM").val(''); $("#UOM").val('');
var value = $("#drpMaterial option:selected").text();
answer = value.replace(/[^a-z]/gi, '');
var converttext = answer.toUpperCase();
if(id != '-1') if(id != '-1')
{ {
if((converttext != 'SERVICE'))
{
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
@ -631,10 +661,15 @@ $("#UOM").val('');
$("#Description").val(json.MatDetail[0]['MaterialName']); $("#Description").val(json.MatDetail[0]['MaterialName']);
$("#UOM").val(json.MatDetail[0]['UOM']); $("#UOM").val(json.MatDetail[0]['UOM']);
} }
});
}); }
else
{
$('#otherDescription').show();
}
//$('#content').loader('hide'); //$('#content').loader('hide');
} }
else else
{ {
swal('Please select the RequestType'); swal('Please select the RequestType');
@ -893,15 +928,21 @@ $('.addClick').click(function(){
$('#Description').val(''); $('#Description').val('');
$('#UOM').val(''); $('#UOM').val('');
$('#Quantity').val(''); $('#Quantity').val('');
$('#otherD').val('')
index = parseInt(index)+1; index = parseInt(index)+1;
var template = jQuery("#tempList").html(); var template = jQuery("#tempList").html();
if(materialdescription == '')
$('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity})); {
$('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity}));
}
else
{
$('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialdescription,UOM:uom,Quantity:quantity}));
}
var theForm = $(".requistion"); var theForm = $(".requistion");
@ -938,6 +979,13 @@ $('.addClick').click(function(){
value:quantity value:quantity
}).appendTo('form'); }).appendTo('form');
$('<input>').attr({
type: 'hidden',
id: 'otherD' + temp,
name: 'otherD'+ temp,
value:materialdescription
}).appendTo('form');
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
} }
@ -965,10 +1013,24 @@ $("#EditItem").on("shown.bs.modal", function(e) {
// alert(userid); // alert(userid);
var tr= document.getElementById(userid); var tr= document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
var check=cellval[2].innerHTML;
var upcheck= check.toUpperCase();
var decs= $('#materialdesc'+userid).val();
if(upcheck=='SERVICE')
{
$('#EditotherDescription').show();
$('#EditotherD').val(decs);
}
else
{
$('#EditotherDescription').hide();
$('#EditotherD').val('')
}
//alert(x[1].innerHTML); //alert(x[1].innerHTML);
$('#EditMaterialCode').val(cellval[1].innerHTML); $('#EditMaterialCode').val(cellval[1].innerHTML);
$('#EditDescription').val(cellval[2].innerHTML); $('#EditDescription').val(cellval[2].innerHTML);
$('#EditUOM').val(cellval[3].innerHTML); $('#EditUOM').val(cellval[3].innerHTML);
$('#EditQuantity').val(cellval[4].innerHTML); $('#EditQuantity').val(cellval[4].innerHTML);
}); });
@ -994,6 +1056,7 @@ $('.EditClick').click(function(){
cellval[3].innerHTML =editUOM; cellval[3].innerHTML =editUOM;
cellval[4].innerHTML = editQuantity; cellval[4].innerHTML = editQuantity;
$('#MaterialCode'+userid).val(editMaterialCode); $('#MaterialCode'+userid).val(editMaterialCode);
$('#Description'+userid).val(editDescription); $('#Description'+userid).val(editDescription);
$('#UOM'+userid).val(editUOM); $('#UOM'+userid).val(editUOM);

172
application/views/empperform.php Executable file
View File

@ -0,0 +1,172 @@
<!-- <?php foreach ($emp_performence_details as $values)
{
print_r($values);
}
?> -->
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style>
span.highlight {
background-color: yellow;
}
div.dt-buttons {
position: relative;
float: right;
}
.btn-success {
background-color: #3c8dbc;
border-color: #3c8dbc;
}
</style>
<div class="content-wrapper">
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Employees Performance</b></p></h3></center>
</div>
<div class="row">
<div class="col-md-12 text-right" style="margin-bottom:-3%;">
<div class="form-group">
</div>
</div>
</div>
<br/>
<br/>
<table id="PerForm" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color:#ddf">
<tr>
<th>EmpID</th>
<th>Employee Name </th>
<th>Status</th>
<th>MonthWorking</th>
<th>MonthPresent</th>
<th>MonthPercentage</th>
<th>YearWorking</th>
<th>YearPresent</th>
<th>YearPercentage</th>
</tr>
</thead>
<tbody>
<?php
foreach ($emp_performence_details as $values)
{
?> <tr>
<td><?php echo $values[0] ?></td>
<td><?php echo $values[1] .' '.$values[2]?></td>
<?php if($values[3]==1){ ?>
<td><?php echo 'Active' ?></td>
<td><?php echo $values[4]['CUR_month'] ?></td>
<td><?php echo $values[4]['values'] ?></td>
<td><?php echo $values[4]['present_percentage'] ?></td>
<td><?php echo $values[5]['totaldays']?></td>
<td><?php echo $values[5]['workeds'] ?></td>
<td><?php echo $values[5]['yeardata'] ?></td>
<?php }else
{
?> <td><?php echo 'InActive' ?></td>
<td><?php echo $values[4]['CUR_month'] ?></td>
<td><?php echo $values[4]['values'] ?></td>
<td><?php echo $values[4]['present_percentage'] ?></td>
<td><?php echo $values[5]['totaldays']?></td>
<td><?php echo $values[5]['workeds'] ?></td>
<td><?php echo $values[5]['yeardata'] ?></td>
</tr>
<?php
}
}
?>
</tbody>
</table>
</div>
</div>
</div>
</section>
</div>
<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js">
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script>
$(document).ready(function() {
table = $('#PerForm').DataTable( {
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [
{
extend: 'excelHtml5',
footer: 'true',
// messageTop: $('').text(),
title: 'Report -Employee Performance ',
exportOptions: {
columns: ':visible'
}
},
'colvis'
]
} );
} );
</script>

11
application/views/importpopdf.php
View File

@ -304,7 +304,7 @@
<tbody> <tbody>
<tr> <tr>
<td style="text-align: center;" colspan="3"> <td style="text-align: center;" colspan="3">
<p>Amended Details</p> <p>Amended revise Details</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -323,7 +323,8 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><strong>Item Description</strong></td> <td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td> <td style="text-align: center;" rowspan="2"><strong>Current Details</strong></td>
<td style="text-align: center;" rowspan="2" ><strong>Revised Details</strong></td>
</tr> </tr>
@ -335,6 +336,12 @@
echo $record->LineAmend ; echo $record->LineAmend ;
} }
} ?> } ?>
<tr>
<td style="text-align: center;"><strong>Total</strong></td>
<td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
<td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
</tr>
</tbody> </tbody>
</table> </table>
<?php } ?> <?php } ?>

22
application/views/includes/pdfheader.php
View File

@ -84,6 +84,7 @@
} }
if(!empty($POItem)) if(!empty($POItem))
{ {
@ -141,7 +142,21 @@
} }
} }
// $amendpostatus='';
// if(!empty($AmendmentPDF))
// {
// foreach ($AmendmentPDF as $apdf)
// {
// $amendpostatus=$apdf->parentpostatus;
// }
// //$asd = $AmendmentPDF[0][parentpostatus];
// print_r($AmendmentPDF);
// //echo $asd;die();
// // echo ;
// // die();
// }
?> ?>
<div> <div>
<div style="text-align: right;">RI/PUR/R 02</div> <div style="text-align: right;">RI/PUR/R 02</div>
@ -150,7 +165,12 @@
<tr style="border: 1px solid black;"> <tr style="border: 1px solid black;">
<td colspan="12"> <td colspan="12">
<center> <span style="font-size:24px;">PURCHASE ORDER</span></center> <?php if ($AmendmentPDF[0]->parentpostatus == 'ST030') { ?>
<center><span style="font-size:24px;">AMENDMENT PURCHASE ORDER</span></center>
<?php } else { ?>
<center><span style="font-size:24px;">PURCHASE ORDER</span></center>
<?php } ?>
</td> </td>
</tr> </tr>

266
application/views/inward_report_create.php Normal file → Executable file
View File

@ -1,3 +1,5 @@
<?php //print_r(count($reports['notgenerated']));?>
<?php //print_r($reports['generated']);?>
<style> <style>
.edit{ .edit{
@ -59,9 +61,24 @@ th{
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3" style="padding:0px">
<div class="col-md-10" >
<label>IGR No</label> <label>IGR No</label>
<?php echo form_dropdown('name="igrno"',$igrnos,set_value('igrno',$igrnos[-1]),'id="igrno"' ,'class="form-control select2', 'style="text-align:center;"');?> <select id='igrno' onchange="changeIGRNO();">
<option value="-1">Select IGRNO</option>
<?php
foreach($records as $rec)
{
echo "<option value=".$rec->IGRNO.">".$rec->IGRNO."</option>";
}
?>
</select>
</div>
<div class="col-md-2"><br>
<a class="btn btn-primary" id="reportbutton" ><i class="fa fa-bars" aria-hidden="true"></i></a>
</div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -79,11 +96,60 @@ th{
<input type="text" id="invoicedate" name="invoicedate" class="form-control" readonly> <input type="text" id="invoicedate" name="invoicedate" class="form-control" readonly>
</div> </div>
</div>
</div>
<div class="row" id="reportarea" style="padding:20px;display:none;">
<div class="col-md-12" style="border:1px solid;height:300;overflow:scroll">
<div class="col-md-6">
<center>
<label>Report Generated IGRNO's</label>
<hr>
<div style="background-color:#e6ffe6;">
<table id="gen" class="table" style="text-align:center;">
<thead><th>IGRNO</th><th>IGR Lineitem No</th></thead>
<?php
if(!empty($reports['generated']))
{
foreach($reports['generated'] as $d)
{
echo "<tr><td onclick='getIGRNO(this.textContent);'>".$d->igrno."</td><td>".$d->igrlineitemno."</td></tr>";
}
}
?>
</table>
</div>
</center>
</div>
<div class="col-md-6">
<center>
<label>Non Report Generated IGRNO's</label>
<hr>
<div style="background-color:#ffeee6;">
<table id="non" class="table" style="text-align:center;">
<thead><th>IGRNO</th></thead>
<?php
if(!empty($reports['notgenerated']))
{
foreach($reports['notgenerated'] as $r)
{
echo "<tr><td onclick='getIGRNO(this.textContent);'>".$r->IGRNO."</td></tr>";
}
}
?>
</table>
</div>
</center>
</div>
</div>
</div> </div>
<div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Supplier Name</label> <label>Supplier Name</label>
<input type="text" id="suppliername" name="suppliername" class="form-control" readonly> <input type="text" id="suppliername" name="suppliername" class="form-control" readonly>
@ -161,7 +227,7 @@ th{
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr> <tr>
<th>NO</th><th>Sieve Size µm</th><th>Mesh Size</th><th>Sand Weight</th><th>Percentage</th><th>Multiplier</th><th>Product</th> <th>NO</th><th>Sieve Size <EFBFBD>m</th><th>Mesh Size</th><th>Sand Weight</th><th>Percentage</th><th>Multiplier</th><th>Product</th>
</tr> </tr>
@ -242,7 +308,28 @@ th{
"lengthChange": true, "lengthChange": true,
"searching": true, "searching": true,
"ordering": true, "ordering": true,
"aaSorting": [[ 0, "asc" ]], "aaSorting": [[ 0, "desc" ]],
"info": true,
"autoWidth": true
});
$('#non').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[ 0, "desc" ]],
"info": true,
"autoWidth": true
});
$('#gen').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[ 0, "desc" ]],
"info": true, "info": true,
"autoWidth": true "autoWidth": true
@ -253,6 +340,7 @@ th{
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
//$("#reportarea").hide();
$("#loibutton").click(function(){ $("#loibutton").click(function(){
$("#loiarea").toggle("slow"); $("#loiarea").toggle("slow");
}); });
@ -263,6 +351,11 @@ $(document).ready(function(){
$("#chartarea").toggle("slow"); $("#chartarea").toggle("slow");
}); });
$("#reportbutton").click(function(){
$("#reportarea").toggle("slow");
});
$('#report_date').datepicker({ $('#report_date').datepicker({
//minDate : 'year+16', //minDate : 'year+16',
maxDate : 'now', maxDate : 'now',
@ -270,44 +363,14 @@ $(document).ready(function(){
}); });
// $('#testreport td').click(funciton(e){ // $('#igrno').select2();
//$('#igrlineitemno').select2();
// alert(e); // alert(e);
// }); // });
//var jsrecords = 10;//<?php echo json_encode($records);?>; //var jsrecords = 10;//<?php echo json_encode($records);?>;
$('#igrno').change(function(){
if($('#igrno').val() != -1)
{
var igrno = $('#igrno').val();
var html = '<option value = -1>Select IGRItemNo</option>';
$('.content').loader('show');
$.ajax({
data:{param1:igrno},
//dataType:"json",
type:"POST",
url:"<?php echo base_url() ?>quality/getIGRLineItemNo",
success:function(data) {
if(data)
{
$('.content').loader('hide');
var data = JSON.parse(data);
//alert(data);
$.each(data,function(index,value){
//alert(value.IGRItemNo);
html+='<option value='+value.IGRItemNo+'>'+value.IGRItemNo+'</option>';
});
$('#igrlineitemno').find('option').remove();
$('#igrlineitemno').append(html);
}
}
});
}
});
$('#igrlineitemno').change(function(){ $('#igrlineitemno').change(function(){
@ -403,7 +466,8 @@ $(document).ready(function(){
}); });
$("#testreport tbody").empty();
$("#loitable tbody").empty();
$("#testreport tbody").append(html); $("#testreport tbody").append(html);
$("#loitable tbody").append(html2); $("#loitable tbody").append(html2);
$('#content').loader('hide'); $('#content').loader('hide');
@ -870,6 +934,9 @@ function calculateMaster(id)
// }); // });
function drawChart(dataset,datalabel){ function drawChart(dataset,datalabel){
var dashlinestart = [11,287,252,217,182,147,112,77,42];
var c = document.getElementById("myCanvas"); var c = document.getElementById("myCanvas");
var ctx = c.getContext("2d"); var ctx = c.getContext("2d");
ctx.clearRect(0, 0, c.width, c.height); ctx.clearRect(0, 0, c.width, c.height);
@ -892,6 +959,7 @@ var canvaswidth = document.getElementById('myCanvas').offsetWidth;
var canvasheight = document.getElementById('myCanvas').offsetHeight; var canvasheight = document.getElementById('myCanvas').offsetHeight;
ctx.beginPath(); ctx.beginPath();
ctx.lineWidth = 1;
ctx.moveTo(30,0); ctx.moveTo(30,0);
ctx.lineTo(30,canvasheight); ctx.lineTo(30,canvasheight);
ctx.strokeStyle="black"; ctx.strokeStyle="black";
@ -899,6 +967,7 @@ ctx.stroke();
ctx.closePath(); ctx.closePath();
ctx.beginPath(); ctx.beginPath();
ctx.lineWidth = 1;
ctx.moveTo(0,(canvasheight-30)); ctx.moveTo(0,(canvasheight-30));
ctx.lineTo(canvaswidth,(canvasheight-30)); ctx.lineTo(canvaswidth,(canvasheight-30));
ctx.strokeStyle="black"; ctx.strokeStyle="black";
@ -908,7 +977,7 @@ ctx.closePath();
ctx.beginPath(); ctx.beginPath();
ctx.font = "bold 12px Arial"; ctx.font = "bold 12px Arial";
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.fillText("Sieve size µm ",(canvaswidth/2),(canvasheight-2)); ctx.fillText("Sieve size <EFBFBD>m ",(canvaswidth/2),(canvasheight-2));
ctx.closePath(); ctx.closePath();
var xaxislabelwidth = (canvaswidth/12); var xaxislabelwidth = (canvaswidth/12);
@ -916,11 +985,26 @@ var xaxislabelwidth = (canvaswidth/12);
var startingpointX = 30; var startingpointX = 30;
var startingpointY = (canvasheight-30); var startingpointY = (canvasheight-30);
for(i=1;i<=dashlinestart.length;i++) // Drawing Dashed Lines from Y
{
ctx.beginPath();
ctx.lineWidth=0.8;
ctx.moveTo(startingpointX,dashlinestart[i-1]);
//console.log(dataset_locationsY[i]);
ctx.lineTo(canvaswidth,dashlinestart[i-1]);
ctx.setLineDash([3,6]);
ctx.strokeStyle="black";
ctx.stroke();
ctx.closePath();
}
ctx.setLineDash([]);
for(i=1;i<=xlabelscount;i++) //X DataLabel for(i=1;i<=xlabelscount;i++) //X DataLabel
{ {
ctx.beginPath(); ctx.beginPath();
ctx.font = "10px Arial"; ctx.font = "bold 10px Arial";
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.fillText(xlabels[i-1],(startingpointX+(xaxislabelwidth * i)),(startingpointY+15)); ctx.fillText(xlabels[i-1],(startingpointX+(xaxislabelwidth * i)),(startingpointY+15));
ctx.closePath(); ctx.closePath();
@ -931,7 +1015,7 @@ for(i=1;i<=xlabelscount;i++) //X DataLabel
for(i=1;i<=xlabelscount;i++) // X Data for(i=1;i<=xlabelscount;i++) // X Data
{ {
ctx.beginPath(); ctx.beginPath();
ctx.arc((startingpointX+(xaxislabelwidth * i)),startingpointY,3,0,2*Math.PI); ctx.arc((startingpointX+(xaxislabelwidth * i)),startingpointY,4,0,2*Math.PI);
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.fill(); ctx.fill();
ctx.closePath(); ctx.closePath();
@ -948,13 +1032,13 @@ for(i=1;i<=xlabelscount;i++) // X Data
{ {
ctx.beginPath(); ctx.beginPath();
ctx.arc(startingpointX,(startingpointY-j),3,0,2*Math.PI); ctx.arc(startingpointX,(startingpointY-j),4 ,0,2*Math.PI);
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.fill(); ctx.fill();
var yl = ((startingpointY-j)); var yl = ((startingpointY-j));
dataset_locationsY.push(yl); dataset_locationsY.push(yl);
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.font = "10px Arial"; ctx.font = "bold 10px Arial";
ctx.fillText((j/7),(startingpointX-30),(startingpointY-j)); ctx.fillText((j/7),(startingpointX-30),(startingpointY-j));
ylabel = ylabel + 5; ylabel = ylabel + 5;
j=j+35; j=j+35;
@ -964,20 +1048,20 @@ for(i=1;i<=xlabelscount;i++) // X Data
var finallocationofY = []; var finallocationofY = [];
var finallocationofX = []; var finallocationofX = [];
for(i=1;i<=xlabelscount;i++) //Exact chart Data Draw red circle for(i=1;i<=xlabelscount;i++) //Exact chart Data Draw red points
{ {
ctx.beginPath(); ctx.beginPath();
<!-- ctx.arc((parseFloat(dataset_locationsX[i-1])),((startingpointY - parseFloat(dataset[i-1]) * 7)),4,0,2*Math.PI); --> <!-- ctx.arc((parseFloat(dataset_locationsX[i-1])),((startingpointY - parseFloat(dataset[i-1]) * 7)),4,0,2*Math.PI); -->
ctx.fillStyle="red"; ctx.fillStyle="red";
ctx.lineCap = 'round'; ctx.lineCap = 'round';
<!-- ctx.fill(); --> <!-- ctx.fill(); -->
ctx.fillRect((parseFloat(dataset_locationsX[i-1])-5),((startingpointY - parseFloat(dataset[i-1]) * 7)-5),8,8) ctx.fillRect((parseFloat(dataset_locationsX[i-1])-5),((startingpointY - parseFloat(dataset[i-1]) * 7)-5),10,10)
finallocationofY.push((startingpointY - parseFloat(dataset[i-1]) * 7)); finallocationofY.push((startingpointY - parseFloat(dataset[i-1]) * 7));
finallocationofX.push(parseFloat(dataset_locationsX[i-1])); finallocationofX.push(parseFloat(dataset_locationsX[i-1]));
ctx.closePath(); ctx.closePath();
//Draw text for data points //Draw text for data points
ctx.beginPath(); ctx.beginPath();
ctx.font = "10px Arial"; ctx.font = "bold 12px Arial";
ctx.fillStyle="blue"; ctx.fillStyle="blue";
ctx.fillText(dataset[i-1],(parseFloat(dataset_locationsX[i-1])),((startingpointY - parseFloat(dataset[i-1]) * 7)-10)); ctx.fillText(dataset[i-1],(parseFloat(dataset_locationsX[i-1])),((startingpointY - parseFloat(dataset[i-1]) * 7)-10));
ctx.closePath(); ctx.closePath();
@ -987,37 +1071,93 @@ for(i=1;i<=xlabelscount;i++) //Exact chart Data Draw red circle
for(i=0;i<=xlabelscount;i++) //Exact Chart Data Draw line for(i=0;i<=xlabelscount;i++) //Exact Chart Data Draw line
{ {
ctx.beginPath();
ctx.lineWidth = 4;
ctx.setLineDash([15,5]);
ctx.moveTo(finallocationofX[i],finallocationofY[i]); ctx.moveTo(finallocationofX[i],finallocationofY[i]);
ctx.lineTo(finallocationofX[i+1],finallocationofY[i+1]); ctx.lineTo(finallocationofX[i+1],finallocationofY[i+1]);
ctx.setLineDash([0,0]);
//ctx.strokeStyle="#1a75ff"; //ctx.strokeStyle="#1a75ff";
ctx.lineWidth=3; //ctx.lineWidth=3;
//setInterval(function(){ //setInterval(function(){
ctx.stroke(); ctx.stroke();
//},30000); //},30000);
}
//ctx.beginPath();
for(i=1;i<=dataset_locationsY.length;i++) // Drawing Dashed Lines from Y
{
ctx.beginPath();
ctx.moveTo(startingpointX,dataset_locationsY[i]);
ctx.lineTo(canvaswidth,dataset_locationsY[i]);
ctx.setLineDash([3,6]);
ctx.strokeStyle="black";
ctx.lineWidth=0.2;
ctx.stroke();
ctx.closePath(); ctx.closePath();
} }
ctx.setLineDash([]);
//ctx.beginPath();
//sctx.closePath(); //sctx.closePath();
} }
function getIGRNO(t)
{
//alert(t);
var tt = t;
var html = "<option value="+tt+">"+tt+"</option>";
$('#igrno').append(html);
$('#igrno').val(tt);
changeIGRNO();
//$("#igrno option:contains("+tt+")").attr("selected",true);
}
function changeIGRNO()
{
//alert($('#igrno :selected').text());
if($('#igrno').val() != -1)
{
var igrno = $('#igrno').val();
$('.content').loader('show');
$.ajax({
data:{param1:igrno},
//dataType:"json",
type:"POST",
url:"<?php echo base_url() ?>quality/getIGRLineItemNo",
success:function(data) {
if(data == '')
{
alert('No Line Item Available..!');
$('.content').loader('hide');
$('#igrno').val('No Line Item Available..!');
// var data = JSON.parse(data);
// $.each(data,function(index,value){
// alert(value.IGRItemNo);
// html+='<option value='+value.IGRItemNo+'>'+value.IGRItemNo+'</option>';
// });
// $('#igrlineitemno').find('option').remove();
// $('#igrlineitemno').append(html);
}
else {
$('.content').loader('hide');
var data = JSON.parse(data);
var html = '<option value = -1>Select IGRItemNo</option>';
$.each(data,function(index,value){
//alert(value.IGRItemNo);
html+='<option value='+value.IGRItemNo+'>'+value.IGRItemNo+'</option>';
});
$('#igrlineitemno').find('option').remove();
$('#igrlineitemno').append(html);
}
}
});
}
}
</script> </script>

58
application/views/inwardgateregister.php
View File

@ -1,5 +1,8 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -139,6 +142,19 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
</div> </div>
</div> </div>
<div class="col-md-12">
<div class="col-md-offset-4">
<div class="box-header">
<input type="file" accept=".png,.jpg,.pdf" onchange="readURL(this);" id="myfile" name="myfile" />
<label for="photo">Select File to upload<br/></label>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -548,31 +564,35 @@ function Save()
if (validate()) if (validate())
{ {
// alert($('#Inwardgateregistertable').rows.count); // // alert($('#Inwardgateregistertable').rows.count);
//alert(" if condition validation part "); // //alert(" if condition validation part ");
$('#content').loader('show'); // $('#content').loader('show');
$.ajax({ // $.ajax({
data:$('.IGR').serialize(), // data:$('.IGR').serialize(),
type:"POST", // type:"POST",
url:"<?php echo base_url() ?>inwardgateregister/addNewigr", // url:"<?php echo base_url() ?>inwardgateregister/addNewigr",
success:function(data) { // success:function(data) {
if(data){ // if(data){
$('#content').loader('hide'); // $('#content').loader('hide');
document.getElementById('finaligr').innerHTML=data; // document.getElementById('finaligr').innerHTML=data;
$('#generateIGR').modal('show'); // $('#generateIGR').modal('show');
} // }
else // else
{ // {
swal("Error"); // swal("Error");
} // }
}//success function closed // }//success function closed
});//ajax closed // });//ajax closed
$("#IGR").attr("method", "post");
$("#IGR").attr("enctype", "multipart/form-data");
$("#IGR").attr("action", "inwardgateregister/addNewigr");
$('#IGR').submit();
}//validate if closed }//validate if closed
}//save function closed }//save function closed
</script> </script>

2
application/views/login.php
View File

@ -47,7 +47,7 @@
<form action="<?php echo base_url(); ?>loginMe" method="post"> <form action="<?php echo base_url(); ?>loginMe" method="post">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="email" class="form-control" placeholder="Email" name="email" required /> <input type="text" class="form-control" placeholder="Email" name="email" required />
<span class="glyphicon glyphicon-envelope form-control-feedback"></span> <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">

279
application/views/monthlypayinputs.php
View File

@ -1,8 +1,20 @@
<?php <?php
// print_r($month);
// echo "-------------";
//print_r($fresh);
$sample = array_merge($month,$fresh); $sample = array_merge($month,$fresh);
$ex = explode('-',$dropdownvalue);
if(strlen($ex[0])== '2')
{
if($ex[0] < 10)
{
$ex1 = substr($ex[0],1);
}
else{
$ex1 = $ex[0];
}
}
else{
$ex1 = $ex[0];
}
$drop = $ex1.'-'.$ex[1];
?> ?>
@ -127,6 +139,9 @@ $('html').bind('keypress', function(e)
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<?php echo form_dropdown('name="monthyear"',$ot,set_value('monthyear',$currentselection),'id="monthyear"' ,'class="form-control select2');?> <?php echo form_dropdown('name="monthyear"',$ot,set_value('monthyear',$currentselection),'id="monthyear"' ,'class="form-control select2');?>
<form id="formid">
<?php echo form_dropdown('monthyear',$ot,set_value('monthyear',$currentselection),'id="monthyear"' ,'class="form-control select2');?>
</form>
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -224,20 +239,52 @@ $('html').bind('keypress', function(e)
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('#monthlylisting').DataTable({ // $('#monthlylistings').DataTable({
"paging": true, // "paging": true,
"lengthChange": true, // "lengthChange": true,
"searching": true, // "searching": true,
"ordering": true, // "ordering": true,
"aaSorting": [[ 0, "asc" ]], // "aaSorting": [[ 0, "asc" ]],
"info": true, // "info": true,
"autoWidth": true // "autoWidth": true
}); // });
});
var t = $('#monthlylistings').DataTable( {
"columnDefs": [ {
"searchable": false,
"orderable": false,
"targets": 0
} ],
"searching": true,
"lengthChange": true,
"info": true,
"autoWidth": true,
"order": [[ 1, 'asc' ]]
} );
t.on( 'order.dt search.dt', function () {
t.column(0, {search:'applied', order:'applied'}).nodes().each( function (cell, i) {
cell.innerHTML = i+1;
} );
} ).draw();
} );
var s = "<?php echo $drop; ?>";
$('#monthyear').val(s);
savebuttonvalidation();
});
@ -273,153 +320,75 @@ $('html').bind('keypress', function(e)
$("#monthyear").change(function(){ $("#monthyear").change(function(){
var curselection = $("#monthyear").val(); $s = $('#monthyear').val();
// alert('current selection'+curselection);
var currentdate = new Date();
var currentmonth = currentdate.getMonth();
currentmonth++;
//alert('currentmonth'+currentmonth);
var res = curselection.split("-");
var selmonth = res[0];
//alert('current selec month '+ selmonth);
var savebuttonstatus = currentmonth - selmonth;
//alert('status'+savebuttonstatus);
if(savebuttonstatus >= 2)
{
$("#savebutton").hide();
}
else if(savebuttonstatus < 0) $("#formid").attr("method", "post");
{
$("#savebutton").hide(); $("#formid").attr("action", "<?php echo base_url() ?>payslip/changeMonth");
}
else if(savebuttonstatus == 0) $('#formid').submit();
{
$("#savebutton").show();
}
else if(savebuttonstatus == 1)
{
$("#savebutton").show();
}
$("#monthlyListings tbody tr").remove(); });
function savebuttonvalidation()
{
var curselection = $("#monthyear").val();
var zero = '0'; var currentdate = new Date();
var month=''; var currentmonth = currentdate.getMonth();
var hyphan = '-'; var currentyear = currentdate.getFullYear();
var currentselection = $("#monthyear").val(); currentmonth++;
//alert(currentselection);
var res = currentselection.split("-");
month = res[0];
if(res[0] <10)
{
var month = zero.concat(res[0]);
}
var finaldate = month.concat(hyphan);
var finaldate = finaldate.concat(res[1]);
//alert(finaldate);
$('.content').loader('show');
$.ajax({
data:{param1:finaldate},
type:"POST", var res = curselection.split("-");
url:"<?php echo base_url() ?>payslip/changeMonth", var selmonth = res[0];
success:function(data) var selyear = res[1];
{
//alert(data); var savebuttonstatus = currentmonth - selmonth;
if(data) var year = currentyear - selyear ;
{
$('#content').loader('hide'); if(savebuttonstatus >= 2)
// alert(data); {
var trHTML=""; if(year == 1)
var obj =JSON.parse(data); {
var temparray = []; $("#savebutton").hide();
var j=0; }
jQuery.each(obj, function(i, val) { else
function checkExist(emp) { {
return emp == val.EmpID; $("#savebutton").hide();
} }
//++i; }
var tmp= temparray.find(checkExist); else if(savebuttonstatus < 0 )
if(tmp != null) {
{
j++; if(year == 1)
{
$("#savebutton").show();
}
else if(year == 0)
{
$("#savebutton").hide();
}
else
{
$("#savebutton").hide();
}
}
else if(savebuttonstatus == 0 && year == 0)
{
$("#savebutton").hide();
}
else if(savebuttonstatus == 1)
{
if(year == 0 || year == 1)
{
$("#savebutton").show();
}
else
{
$("#savebutton").show();
}
}
}else{ }
//alert(val.EmpID + "First");
temparray.push(val.EmpID);
++i
i=i-j;
var Days_Worked = val.Days_worked;
if(Days_Worked == null){ Days_Worked="0.00";}
var LOP_Days = val.LOP_Days;
if(LOP_Days == null){ LOP_Days="0.00";}
var Paid_leave = val.Paid_leave;
if(Paid_leave == null){ Paid_leave = "0.00";}
var OT_Hrs_Worked = val.OT_Hrs_Worked;
if(OT_Hrs_Worked == null){ OT_Hrs_Worked = "0.00";}
var Loan_Recovered = val.Loan_Recovered;
if(Loan_Recovered == null){ Loan_Recovered = "0.00";}
var Incentives = val.Incentives;
if(Incentives == null){ Incentives = "0.00";}
var Other_Deductions = val.Other_Deductions;
if(Other_Deductions == null){ Other_Deductions = "0.00";}
if(val.Key)
{
trHTML += '<tr>' +
'<td style="text-align:right;">' + (i) + '</td>' +
'<td style="text-align:right;">' + val.EmpID + '</td>' +
'<td>' + val.FirstName+" "+ val.LastName + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Days_Worked + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + LOP_Days + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Paid_leave + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + OT_Hrs_Worked + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Loan_Recovered + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Incentives + '</td>' +
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Other_Deductions+ '</td>' +
'</tr>';
}
else
{
trHTML += '<tr>' +
'<td style="text-align:right;">' + (i) + '</td>' +
'<td style="text-align:right;">' + val.EmpID + '</td>' +
'<td>' + val.FirstName+" "+ val.LastName + '</td>' +
'<td contenteditable="false" style="text-align:right;">' + Days_Worked + '</td>' +
'<td contenteditable="false" style="text-align:right;">' + LOP_Days + '</td>' +
'<td contenteditable="false" style="text-align:right;">' + Paid_leave + '</td>' +
'<td contenteditable="false" style="text-align:right;">' + OT_Hrs_Worked + '</td>' ;
if(val.Loan_ID){
trHTML += '<td contenteditable="true" title="Loan Pending" style="background-color:#ffcccc;text-align:right;">' + Loan_Recovered + '</td>';
}
else{
trHTML += '<td contenteditable="false" style="text-align:right;">' + Loan_Recovered + '</td>';
}
trHTML += '<td contenteditable="true" style="text-align:right;">' + Incentives + '</td>' +
'<td contenteditable="true" style="text-align:right;">' + Other_Deductions+ '</td>' +
'</tr>';
}
}
});
// //alert(trHTML);
//alert(temparray);
$('#monthlyListings > tbody').append(trHTML);
$('.content').loader('hide');
}
}
});
});
</script> </script>

42
application/views/paysliplist.php
View File

@ -1,4 +1,11 @@
<?php //print_r($PayInfo);?> <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet">
<?php //print_r($PayInfo);
$datefordropdown = date_create($datefordropdown);
$datefordropdown = date_format($datefordropdown,'m-Y');
date_default_timezone_set('Asia/Kolkata');
?>
<style type="text/css"> <style type="text/css">
.num { .num {
text-align:right; text-align:right;
@ -16,6 +23,22 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-md-2">
<?php
$attributes = array('id' => 'paylist');
echo form_open('paysliplist', $attributes);
$today = date('m-Y');
$data = array('type' => 'text','name' => 'month','id' => 'month','value' => $datefordropdown,'class' => 'form-control select2');
echo form_input($data);
?>
</div>
<div class="col-md-2">
<input id="changemonth" value="Change Month" class="btn btn-primary" title='click here to view payslip Data'>
</div>
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
@ -41,7 +64,7 @@
</tr> </tr>
</thead> </thead>
<tbody id="tbody">
<?php <?php
if(!empty($PayInfo)) if(!empty($PayInfo))
{ {
@ -74,6 +97,7 @@
} }
} }
?> ?>
</tbody>
</table> </table>
</div><!-- /.box-body --> </div><!-- /.box-body -->
@ -89,6 +113,13 @@
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$("#month").datepicker({
minViewMode: 1,
format: 'mm-yyyy'
});
var dropdown = "<?php echo $dropdownvalue; ?>";
$('#month').val(dropdown);
$('#monthlylistings').DataTable({ $('#monthlylistings').DataTable({
"paging": true, "paging": true,
@ -101,4 +132,11 @@
}); });
}); });
$('#changemonth').on("click", function(){
$("#paylist").attr("method", "post");
$("#paylist").attr("action", "<?php echo base_url() ?>payslip/reload_paysliplist");
$("#paylist").submit();
});
</script> </script>

2
application/views/pfreportprint.php
View File

@ -42,7 +42,7 @@ if(!empty($companyinfo))
<thead> <thead>
<tr style="height: 21px;"> <tr style="height: 21px;">
<th style="text-align: center;"><strong>Sno</strong></th> <th style="text-align: center;"><strong>Sno</strong></th>
<th style="text-align: center;"><strong>EPO Account No</strong></th> <th style="text-align: center;"><strong>PF Account No</strong></th>
<th style=" text-align: center;"><strong>Employee Contribution</strong></th> <th style=" text-align: center;"><strong>Employee Contribution</strong></th>
<th style=" text-align: center;"><strong>Employeer Contribution</strong></th> <th style=" text-align: center;"><strong>Employeer Contribution</strong></th>
<th style=" text-align: center;"><strong>No of days Present</strong></th> <th style=" text-align: center;"><strong>No of days Present</strong></th>

4
application/views/publicholidays.php
View File

@ -107,7 +107,7 @@ $('html').bind('keypress', function(e)
<!-- <td style="text-align:right;"><?php echo $index ?></td> --> <!-- <td style="text-align:right;"><?php echo $index ?></td> -->
<td contenteditable='true' style="text-align:left;"><?php if(!empty($day->H_Name)){echo $day->H_Name;}else{echo "NO DATA";}?></td> <td contenteditable='true' style="text-align:left;"><?php if(!empty($day->H_Name)){echo $day->H_Name;}else{echo "NO DATA";}?></td>
<td contenteditable='true' style="text-align:right;"><?php echo $date;?></td> <td contenteditable='false' style="text-align:right;"><?php echo $date;?></td>
<td style="text-align:right;"><a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a></td> <td style="text-align:right;"><a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a></td>
</tr> </tr>
@ -159,7 +159,7 @@ $('html').bind('keypress', function(e)
<script type="text/html" id="addList"> <script type="text/html" id="addList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td style="text-align:left;" contenteditable="true"><%=Holiday_Name%></td> <td style="text-align:left;" contenteditable="true"><%=Holiday_Name%></td>
<td style="text-align:right;" contenteditable="true"><%=Date%></td> <td style="text-align:right;" contenteditable="false"><%=Date%></td>
<td style="text-align:right;"> <td style="text-align:right;">
<a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
</td> </td>

295
application/views/report_emp.php Normal file
View File

@ -0,0 +1,295 @@
<?php
//print_r($fy);die();
?>
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style>
.dataTables_filter input {padding: 4px;}
.dataTables_filter {
width: 50%;
float: right;
text-align: right;
}
.dataTables_paginate {
width: 50%;
float: right;
text-align: right;
}
div.dt-buttons {
position: relative;
float: right;
}
.btn-success {
background-color: #3c8dbc;
border-color: #3c8dbc;
}
.col-md-offset-1 {
margin-left: 2.333333%;
padding-top: 5px;
}
</style>
<div class="row" style="min-height: 600px;">
<!-- Left col -->
<div class="col-md-12">
<!-- TABLE: LATEST ORDERS -->
<div class="box box-info">
<div class="box-header with-border">
<center><h3 class="box-title"><p style="color:#3c8dbc"><b>Employee Performance</b><br>
<?php
if($this->input->post('financialyear')){
$ab=$this->input->post('financialyear');
echo '('.$ab.')';
echo ' ';
}
if($this->input->post('month')){
$m=$this->input->post('month');
echo '('.$m.')';
echo ' ';
}
?>
</p></h3></center>
</div>
<!-- /.box-header -->
<div class="panel-body">
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
<div class="form-group has-feedback">
<div class="col-md-2">
<label for="to_date">
<?php echo 'Year'; ?>
</label>
<div class="input-group">
<select class="form-control" id="financialyear" name="financialyear">
<option value="">Select Year</option>
<?php
foreach($fy as $item):
{?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option>
<?php } endforeach; ?>
</select>
</div>
</div>
<div class="col-md-2">
<label for="to_date">
<?php echo 'Month'; ?>
</label>
<div class="input-group">
<select class="form-control" id="month" name="month">
<option value="">Select Month</option>
<option value="January">January</option>
<option value="February">February</option>
<option value="March">March</option>
<option value="April">April</option>
<option value="May">May</option>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
</select>
</div>
</div>
<div class="col-md-2 col-md-offset-1"><br>
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
</div>
</form>
</div>
</div>
<div class="box-body">
<div>
<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
<thead>
<tr>
<th rowspan="2">EmpID</th>
<th rowspan="2">Employee Name </th>
<th rowspan="2">Status</th>
<th colspan="3"><center>Month</center></th>
<th colspan="3"><center>Year</center></th>
</tr>
<tr>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
</tr>
</thead>
<tbody>
<?php if(!empty($per)){
$tr3=0;
$tr4=0;
$last = $this->uri->total_segments();
$ab=$this->uri->segment($last);
foreach($per as $rel)
{
?>
<tr>
<td><span>
<?php echo $rel->Eid;?>
</span></td>
<td><span><?php echo $rel->ename;?></span></td>
<td style="text-align:right"><span><?php
if($rel->active == 1){
echo 'Active';
}else
{
echo 'In Active';
}
?></span></td>
<td style="text-align:right"><span><?php
echo $rel->days;?></span></td>
<td style="text-align:right"><span><?php echo $rel->worked;?></span></td>
<td style="text-align:right"><span><?php echo $rel->percentage;?></span></td>
<td style="text-align:right"><span><?php echo $rel->yday;?></span></td>
<td style="text-align:right"><span><?php echo $rel->yworkd;?></span></td>
<td style="text-align:right"><span><?php echo $rel->ypercentage;?></span></td>
</tr>
<?php
}
?>
</tbody>
<tfoot width="100%">
</tfoot>
<?php
}
?>
</table>
</div>
</div>
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script>
// Bootstrap datepicker
// Set up your table
$(document).ready(function() {
table = $('#cc').DataTable( {
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [
{
extend: 'excelHtml5',
footer: 'true',
//messageTop: $('h3').text(),
title: $('h3').text(),
exportOptions: {
columns: ':visible'
}
},
'colvis'
]
} );
} );
$('#mySelect').on('change',function(){
table
.column(4)
.search(this.value)
.draw();
});
$( function() {
//var dateFormat = "mm/dd/yy",
from = $( "#min-date" )
.datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
})
.on( "change", function() {
to.datepicker("option", "minDate", getDate( this ) );
}),
to = $( "#max-date" ).datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
})
.on( "change", function() {
from.datepicker( "option", "maxDate", getDate( this ) );
});
function getDate( element ) {
var date;
try {
date = $.datepicker.parseDate( dateFormat, element.value );
} catch( error ) {
date = null;
}
return date;
}
} );
function Reset()
{
$('#mySelect').val('');
}
</script>

9
application/views/report_pendingreqst.php
View File

@ -362,13 +362,10 @@ buttons: [
{ {
extend: 'excelHtml5', extend: 'excelHtml5',
footer: 'true', footer: 'true',
//messageTop: $('h3').text(),
messageTop: $('h3').text(), //title: 'Report - Pending Request',
title: $('h3').text(),
title: 'Report - Pending Request',
exportOptions: { exportOptions: {
columns: ':visible' columns: ':visible'

15
application/views/reportslink.php
View File

@ -46,13 +46,13 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<h4><span class="fa fa-truck">&nbsp; Inward</span></h4> <h4><span class="fa fa-truck">&nbsp; Inward</span></h4>
<a href="<?php echo base_url(); ?>Report_purchase_inward" target="_blank" >Purchase<p class="uk-text uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_purchase_inward" target="_blank" >Purchase-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_year_wise_inward" target="_blank" >Year Wise<p class="uk-text-meta uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_year_wise_inward" target="_blank" >Year Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_supplier_inward" target="_blank" >Purchase Supplier - Wise<p class="uk-text uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_supplier_inward" target="_blank" >Purchase Supplier - Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_consolidate_inward" target="_blank" >Consolidate Report<p class="uk-text-meta uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_consolidate_inward" target="_blank" >Consolidate Report-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_inward" target="_blank" >Cumulative Report<p class="uk-text uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_cumulative_inward" target="_blank" >Cumulative Report-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_raw" target="_blank" >Cumulative Report - Category Wise<p class="uk-text uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_cumulative_raw" target="_blank" >Cumulative Report - Category Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_consolidate_category" target="_blank" >Consolidate Report - Category Wise<p class="uk-text-meta uk-margin-remove"></p></a> <a href="<?php echo base_url(); ?>Report_consolidate_category" target="_blank" >Consolidate Report - Category Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
</div> </div>
</div> </div>
@ -84,6 +84,7 @@
<div class="col-xs-3"> <div class="col-xs-3">
<h4><span class="fa fa-calendar">&nbsp; Attendance </span></h4> <h4><span class="fa fa-calendar">&nbsp; Attendance </span></h4>
<p class="uk-text uk-margin-remove" target="_blank" >Employee Attendance</p> <p class="uk-text uk-margin-remove" target="_blank" >Employee Attendance</p>
<a href="<?php echo base_url(); ?>Empperform" target="_blank">Employee Performance<p class="uk-text uk-margin-remove"></p></a>
</div> </div>

51
application/views/requisitionform.php
View File

@ -241,6 +241,15 @@ if(!empty($Emp))
?> ?>
</div> </div>
</div> </div>
<div class="col-md-6" id="otherDescription" style="display:none;">
<label>Other Description</label>
<div class="form-group">
<?php
$data = array('name' => 'otherD','value' => set_value('otherD'),'id'=>'otherD', 'class' => 'form-control' ,'rows' => '5', 'cols' => '70','maxlength' => '500');
echo Form_textarea($data);
?>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label>UOM</label> <label>UOM</label>
<div> <div>
@ -304,6 +313,15 @@ if(!empty($Emp))
?> ?>
</div> </div>
</div> </div>
<div class="col-md-6" id="EditotherDescription">
<label>Other Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditotherD','value' => set_value('EditotherD'),'id'=>'EditotherD', 'class' => 'form-control','readonly'=>'true' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label>UOM</label> <label>UOM</label>
<div> <div>
@ -374,7 +392,8 @@ if(!empty($Emp))
</div> </div>
<script> <script>
$('#otherDescription').hide();
$('#EditotherDescription').hide();
var isExceed = 0; var isExceed = 0;
function isNumberKey(evt) function isNumberKey(evt)
{ {
@ -502,12 +521,18 @@ $('#CostCenter').change(function() {
$('#MaterialCode').change(function() { $('#MaterialCode').change(function() {
var id = $('#MaterialCode').val(); var id = $('#MaterialCode').val();
var value = $("#MaterialCode option:selected").text();
answer = value.replace(/[^a-z]/gi, '');
var checkanswer=answer.toUpperCase();
$("#Description").val(''); $("#Description").val('');
$("#UOM").val(''); $("#UOM").val('');
if(id != '-1') if(id != '-1')
{ {
$('#content').loader('show'); if((checkanswer != 'SERVICE'))
{
$('#content').loader('show');
$.ajax({ $.ajax({
data:{id:id}, data:{id:id},
@ -522,6 +547,13 @@ $("#UOM").val('');
} }
}); });
}
else
{
$('#otherDescription').show();
}
//$('#content').loader('hide'); //$('#content').loader('hide');
} }
else else
@ -709,6 +741,7 @@ function validateBeforeAdd()
else else
{ {
$('#myModal1').modal('show'); $('#myModal1').modal('show');
$('#otherDescription').hide();
} }
} }
@ -734,20 +767,29 @@ $('.addClick').click(function(){
var materialName = $("#Description").val(); var materialName = $("#Description").val();
var uom = $("#UOM").val(); var uom = $("#UOM").val();
var quantity = $("#Quantity").val(); var quantity = $("#Quantity").val();
var materialdescription= $('#otherD').val();
$('#MaterialCode option[value='+materialCode+']').remove(); $('#MaterialCode option[value='+materialCode+']').remove();
$('#Description').val(''); $('#Description').val('');
$('#UOM').val(''); $('#UOM').val('');
$('#Quantity').val(''); $('#Quantity').val('');
$('#otherDescription').hide();
$('#otherD').val('');
index = parseInt(index)+1; index = parseInt(index)+1;
var template = jQuery("#tempList").html(); var template = jQuery("#tempList").html();
if(materialdescription == '')
{
$('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity})); $('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity}));
}
else
{
$('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialdescription,UOM:uom,Quantity:quantity}));
}
var theForm = $(".requistion"); var theForm = $(".requistion");
@ -755,6 +797,7 @@ $('.addClick').click(function(){
addHidden(theForm,"Description"+temp,materialName); addHidden(theForm,"Description"+temp,materialName);
addHidden(theForm,"UOM"+temp,uom); addHidden(theForm,"UOM"+temp,uom);
addHidden(theForm,"Quantity"+temp,quantity); addHidden(theForm,"Quantity"+temp,quantity);
addHidden(theForm,"otherD"+temp,materialdescription);
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);

9
application/views/revenuepopdf.php
View File

@ -294,7 +294,8 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><strong>Item Description</strong></td> <td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td> <td style="text-align: center;" rowspan="2"><strong>Current Details</strong></td>
<td style="text-align: center;" rowspan="2" ><strong>Revised Details</strong></td>
</tr> </tr>
<?php if(!empty($POItem)) <?php if(!empty($POItem))
@ -306,9 +307,15 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
} }
} }?> } }?>
<tr>
<td style="text-align: center;"><strong>Total</strong></td>
<td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
<td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
</tr>
</tbody> </tbody>
</table> </table>
<br> <br>

26
application/views/servicePurchaseorder.php
View File

@ -332,6 +332,14 @@ $("#txtBasicValue").val('');
$("#UOM").val(obj.UOM); $("#UOM").val(obj.UOM);
$("#Quantity").val(obj.Quantity); $("#Quantity").val(obj.Quantity);
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
var materialn=obj.MaterialName;
var materialname=materialn.toUpperCase();
if(materialname == 'SERVICE')
{
$('#otherdescription').show();
$('#OtheritemDescription').val(obj.MaterialDescription);
}
} }
}); });
} }
@ -1083,6 +1091,15 @@ function clearEditTaxField()
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-3" id="otherdescription">
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'OtheritemDescription','value' => set_value('OtheritemDescription'),'id'=>'OtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
@ -1357,6 +1374,15 @@ function clearEditTaxField()
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-3" id=EditotherDescription>
<label>Item Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditOtheritemDescription','value' => set_value('EditOtheritemDescription'),'id'=>'EditOtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>

9
application/views/servicepopdf.php
View File

@ -287,7 +287,8 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><strong>Item Description</strong></td> <td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td> <td style="text-align: center;" rowspan="2"><strong>Current Details</strong></td>
<td style="text-align: center;" rowspan="2" ><strong>Revised Details</strong></td>
</tr> </tr>
<?php if(!empty($POItem)) <?php if(!empty($POItem))
{ {
@ -296,6 +297,12 @@
echo $record->lineamenddetails ; echo $record->lineamenddetails ;
} }
} ?> } ?>
<tr>
<td style="text-align: center;"><strong>Total</strong></td>
<td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
<td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
</tr>
</tbody> </tbody>
</table> </table>
<?php <?php

16
application/views/viewIGRDetails.php
View File

@ -35,6 +35,7 @@
<th>Date of Invoice</th> <th>Date of Invoice</th>
<th>Vechicle No</th> <th>Vechicle No</th>
<th>Courier No</th> <th>Courier No</th>
<th>File</th>
</tr> </tr>
@ -60,6 +61,21 @@
echo $date->format('d-m-Y'); ?></td> echo $date->format('d-m-Y'); ?></td>
<td><?php echo $record->VehicleNo ?></td> <td><?php echo $record->VehicleNo ?></td>
<td><?php echo $record->CourierNo ?></td> <td><?php echo $record->CourierNo ?></td>
<td>
<?php
if(!empty($record->file))
{
?>
<a target="_blank" href="<?php echo base_url().$record->file ?>"><i class="fa fa-download" ></i></a>
<?php
} else{
echo "NO FILE";
}
?>
</td>
</tr> </tr>
<?php <?php