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

FIX_FIncap Remove, Matedical code field enlarged,supplier MSME added in po

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-07-29 10:38:12 +00:00
parent de6dd71394
commit 9cd30ab31c
28 changed files with 447 additions and 733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/Amendmentpurchaseorder.php
View File

@ -237,7 +237,7 @@ class Amendmentpurchaseorder extends BaseController
$supplierreference = $this->request->getPost('amendsupplierreference');
$supplieroffno = $this->request->getPost('amendsupplierofferno');
$otherreference = $this->request->getPost('amendotherreference');
$fincap = $this->request->getPost('amendfincap');
$fincap = "";//$this->request->getPost('amendfincap');
$revenuetype = $this->request->getPost('PoTypeOptions');
$insurancestatus = $this->request->getPost('insurancestatus');
if ($insurancestatus == 1) {
@ -590,7 +590,7 @@ class Amendmentpurchaseorder extends BaseController
$SupplierReference = $this->request->getPost('amendsupplierreference');
$SuppliersOfferNo = $this->request->getPost('amendsupplierofferno');
$OtherReferences = $this->request->getPost('amendotherreference');
$Fincap = $this->request->getPost('amendfincap');
$Fincap = "";//$this->request->getPost('amendfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@ -850,7 +850,7 @@ class Amendmentpurchaseorder extends BaseController
$SupplierReference = $this->request->getPost('amendsupplierreference');
$SuppliersOfferNo = $this->request->getPost('amendsupplierofferno');
$OtherReferences = $this->request->getPost('amendotherreference');
$Fincap = $this->request->getPost('amendfincap');
$Fincap = "";//$this->request->getPost('amendfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@ -1258,7 +1258,7 @@ class Amendmentpurchaseorder extends BaseController
$SupplierRef = $this->request->getPost('amendsupplierreference');
$SupplierOffer = $this->request->getPost('amendsupplierofferno');
$otherRef = $this->request->getPost('amendotherreference');
$finCap = $this->request->getPost('amendfincap');
$finCap = "";//$this->request->getPost('amendfincap');
$OtherPayment = $this->request->getPost('Otherpayment');

4
app/Controllers/Emergencypurchaseorder.php
View File

@ -187,7 +187,7 @@ class Emergencypurchaseorder extends BaseController
$SupplierReference = $this->request->getPost('emergsupplierreference');
$SuppliersOfferNo = $this->request->getPost('emergsupplierofferno');
$OtherReferences = $this->request->getPost('emergotherreference');
$Fincap = $this->request->getPost('emergfincap');
$Fincap = "";//$this->request->getPost('emergfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@ -388,7 +388,7 @@ class Emergencypurchaseorder extends BaseController
$supplierreference = $this->request->getPost('emergsupplierreference');
$supplieroffno = $this->request->getPost('emergsupplierofferno');
$otherreference = $this->request->getPost('emergotherreference');
$fincap = $this->request->getPost('emergfincap');
$fincap = "";//$this->request->getPost('emergfincap');
$revenuetype = $this->request->getPost('PoTypeOptions');
$insurancestatus = $this->request->getPost('insuranceStatus');
if ($insurancestatus == 1) {

12
app/Controllers/Purchaseorder.php
View File

@ -1079,7 +1079,7 @@ $mpdf->use_kwt = true;
$supplierreference = $this->request->getPost('addsupplierreference');
$supplieroffno = $this->request->getPost('addsupplierofferno');
$otherreference = $this->request->getPost('addotherreference');
$fincap = $this->request->getPost('addfincap');
$fincap = "";//$this->request->getPost('addfincap');
$revenuetype = $this->request->getPost('PoTypeOptions');
$insurancestatus = $this->request->getPost('insurance');
$InsuranceNumber = ($insurancestatus == 1) ? $this->request->getPost('InsuranceNumber') : '';
@ -1215,7 +1215,7 @@ $mpdf->use_kwt = true;
$supplierreference = $this->request->getPost('editsupplierreference');
$supplieroffno = $this->request->getPost('editsupplierofferno');
$otherreference = $this->request->getPost('editotherreference');
$fincap = $this->request->getPost('editfincap');
$fincap = "";// $this->request->getPost('editfincap');
$revenuetype = $this->request->getPost('PoTypeOptions');
$insurancestatus = $this->request->getPost('insurancestatus');
if ($insurancestatus == 1) {
@ -1849,7 +1849,7 @@ $mpdf->use_kwt = true;
$SupplierRef = $this->request->getPost('addsupplierreference');
$SupplierOffer = $this->request->getPost('addsupplierofferno');
$otherRef = $this->request->getPost('addotherreference');
$finCap = $this->request->getPost('addfincap');
$finCap = "";//$this->request->getPost('addfincap');
$importoption = $this->request->getPost('Importoption');
$Insurance = $this->request->getPost('Insurance');
@ -2039,7 +2039,7 @@ $mpdf->use_kwt = true;
$SupplierRef = $this->request->getPost('editsupplierreference');
$SupplierOffer = $this->request->getPost('editsupplierofferno');
$otherRef = $this->request->getPost('editotherreference');
$finCap = $this->request->getPost('editfincap');
$finCap = "";//$this->request->getPost('editfincap');
@ -2451,7 +2451,7 @@ try{
$SupplierReference = $this->request->getPost('addsupplierreference');
$SuppliersOfferNo = $this->request->getPost('addsupplierofferno');
$OtherReferences = $this->request->getPost('addotherreference');
$Fincap = $this->request->getPost('addfincap');
$Fincap = "";//$this->request->getPost('addfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@ -2725,7 +2725,7 @@ try{
$SupplierReference = $this->request->getPost('editsupplierreference');
$SuppliersOfferNo = $this->request->getPost('editsupplierofferno');
$OtherReferences = $this->request->getPost('editotherreference');
$Fincap = $this->request->getPost('editfincap');
$Fincap = "";//$this->request->getPost('editfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');

4
app/Controllers/Servicepurchaseorder.php
View File

@ -206,7 +206,7 @@ class Servicepurchaseorder extends BaseController
$SupplierReference = $this->request->getPost('addsupplierreference');
$SuppliersOfferNo = $this->request->getPost('addsupplierofferno');
$OtherReferences = $this->request->getPost('addotherreference');
$Fincap = $this->request->getPost('addfincap');
$Fincap = "";//$this->request->getPost('addfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@ -350,7 +350,7 @@ class Servicepurchaseorder extends BaseController
$SupplierReference = $this->request->getPost('editsupplierreference');
$SuppliersOfferNo = $this->request->getPost('editsupplierofferno');
$OtherReferences = $this->request->getPost('editotherreference');
$Fincap = $this->request->getPost('editfincap');
$Fincap = "";//$this->request->getPost('editfincap');
$InsuranceOptions = $this->request->getPost('insuranceStatus');
$InsuranceNumber = $this->request->getPost('InsuranceNumber');
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');

3
app/Models/Inwardgateregister_model.php
View File

@ -266,6 +266,9 @@ class Inwardgateregister_model extends Model
$builder = $this->db->table('t_igr_details');
$builder->insert($igrD);
$aff_row = $this->db->affectedRows();
log_message('error', 'addigrD Query: ' . $this->db->getLastQuery()->getQuery());
$this->db->transComplete();
$result = $this->db->table('t_igr_details')

2
app/Models/Purchaseorder_model.php
View File

@ -413,7 +413,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
*/
function getSupplierName($supID = '')
{
$builder = $this->db->table('t_supplierdetailsn')->select('SupplierID, SupplierName,Address,PaymentID')
$builder = $this->db->table('t_supplierdetailsn')->select('SupplierID, SupplierName,Address,PaymentID,MSME')
->where('IsActive', 1);
if ($supID != '') {
$builder->where('SupplierID', $supID);

18
app/Views/EditservicePurchaseorder.php
View File

@ -30,7 +30,6 @@ $ModeOfShipment = '';
$SupplierReference = '';
$SuppliersOfferNo = '';
$OtherReferences = '';
$Fincap = '';
$InsuranceOptions = '';
$InsuranceNumber = '';
$ServiceTypeOptions = '';
@ -75,7 +74,6 @@ if (!empty($POMaster)) {
$SupplierReference = $Req->Supplier_Reference;
$SuppliersOfferNo = $Req->Supplier_Offer_No;
$OtherReferences = $Req->Other_Reference;
$Fincap = $Req->Fincap;
$InsuranceOptions = $Req->InsuranceStatus;
$InsuranceNumber = $Req->InsuranceNumber;
$ServiceTypeOptions = $Req->POSubType;
@ -771,10 +769,7 @@ if (!empty($getlogpodtl)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.')' : '');
endforeach;
}
@ -935,7 +930,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -946,16 +941,7 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'editfincap', 'value' => set_value('editfincap', $Fincap), 'id' => 'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

14
app/Views/alterpurchaseorder.php
View File

@ -2120,7 +2120,7 @@ if (!empty($INRSYMBOL)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -2361,7 +2361,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right:0px;">
<div class="col-md-12" style="padding-right:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -2372,16 +2372,6 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'emergfincap', 'value' => set_value('emergfincap'), 'id' => 'emergfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

2
app/Views/capitalpopdf.php
View File

@ -19,7 +19,6 @@ $PaymentTerms = '';
$PaymentOtherDescription = '';
$DeliverySchedule = '';
$advance = 0;
$finCap = '';
$modShp = '';
$insNo = '';
$insNo = '';
@ -87,7 +86,6 @@ if (!empty($POItem)) {
$dispatch = $PO->Import_DispatchDetails;
}
$ServiceDescription = $PO->ServiceDescription;
$finCap = $PO->Fincap;
$modShp = $PO->Mode_Of_Shipment;
if ($PO->InsuranceNumber == '') {
$insNo = 'No';

17
app/Views/capitalpurchaseorder.php
View File

@ -386,10 +386,7 @@ function vaildateBeforeOpenModal()
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -610,7 +607,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -620,16 +617,6 @@ function vaildateBeforeOpenModal()
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'addfincap','value' => set_value('addfincap'),'id'=>'addfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>

20
app/Views/editCapitalAmendPO.php
View File

@ -82,7 +82,6 @@
$SupplierReference='';
$SuppliersOfferNo='';
$OtherReferences='';
$Fincap='';
$InsuranceOptions='';
$InsuranceNumber='';
$ServiceTypeOptions='';
@ -172,7 +171,6 @@ if(!empty($POMaster))
$SupplierReference=$Req->Supplier_Reference;
$SuppliersOfferNo=$Req->Supplier_Offer_No;
$OtherReferences=$Req->Other_Reference;
$Fincap=$Req->Fincap;
$InsuranceOptions=$Req->InsuranceStatus;
$InsuranceNumber=$Req->InsuranceNumber;
$ServiceTypeOptions=$Req->POSubType;
@ -276,7 +274,6 @@ $('#addmodeofshipment').attr("style", "pointer-events: none;");
$('#amendsupplierreference').attr("style", "pointer-events: none;");
$('#amendsupplierofferno').attr("style", "pointer-events: none;");
$('#amendotherreference').attr("style", "pointer-events: none;");
$('#amendfincap').attr("style", "pointer-events: none;");
$('#PoTypeOptions').attr("style", "pointer-events: none;");
$('#InsuranceNumber').attr("style", "pointer-events: none;");
$('#insuranceStatus').attr("style", "pointer-events: none;");
@ -500,10 +497,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options2[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.')' : '');
endforeach;
}
@ -708,7 +702,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -719,16 +713,6 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap',$Fincap),'id'=>'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

18
app/Views/editCapitalPo.php
View File

@ -87,7 +87,6 @@
$SupplierReference='';
$SuppliersOfferNo='';
$OtherReferences='';
$Fincap='';
$InsuranceOptions='';
$InsuranceNumber='';
$ServiceTypeOptions='';
@ -164,7 +163,6 @@ if(!empty($POMaster))
$SupplierReference=$Req->Supplier_Reference;
$SuppliersOfferNo=$Req->Supplier_Offer_No;
$OtherReferences=$Req->Other_Reference;
$Fincap=$Req->Fincap;
$InsuranceOptions=$Req->InsuranceStatus;
$InsuranceNumber=$Req->InsuranceNumber;
$ServiceTypeOptions=$Req->POSubType;
@ -547,10 +545,7 @@ $("#PaymentMethod").select2();
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options2[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options2[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -754,7 +749,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right:0px;">
<div class="col-md-12" style="padding-right:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -765,16 +760,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

16
app/Views/editImportAmendPO.php
View File

@ -156,7 +156,6 @@ if(!empty($POMaster))
$SupplierRef=$Req->Supplier_Reference;
$SupOfferno=$Req->Supplier_Offer_No;
$Otherref=$Req->Other_Reference;
$Fincap=$Req->Fincap;
$Otherpay=$Req->PaymentOtherDescription;
@ -389,10 +388,7 @@ if(!empty($RequistionDetails))
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -662,16 +658,6 @@ if(!empty($RequistionDetails))
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap',$Fincap),'id'=>'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

16
app/Views/editRevenueAmendPO.php
View File

@ -61,7 +61,6 @@ foreach ($PaymentTerms as $TER)
$supplierref='';
$suppofferno='';
$otherref='';
$fincap='';
$revenuesubtype='';
$insurencestatus='';
$insurenceno='';
@ -100,7 +99,6 @@ if(!empty($POMaster))
$supplierref = $Req->Supplier_Reference;
$suppofferno = $Req->Supplier_Offer_No;
$otherref = $Req->Other_Reference;
$fincap = $Req->Fincap;
$revenuesubtype = $Req->POSubType;
$insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
@ -1031,10 +1029,7 @@ function calculateEditTaxValue()
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.')' : '');
endforeach;
}
@ -1192,16 +1187,7 @@ function calculateEditTaxValue()
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap',$fincap),'id'=>'amendfincap', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

18
app/Views/editRevenuepurchaseorder.php
View File

@ -11,7 +11,6 @@ $modeofshipment = '';
$supplierref = '';
$suppofferno = '';
$otherref = '';
$fincap = '';
$revenuesubtype = '';
$insurencestatus = '';
$insurenceno = '';
@ -96,7 +95,6 @@ if (!empty($POMaster)) {
$supplierref = $Req->Supplier_Reference;
$suppofferno = $Req->Supplier_Offer_No;
$otherref = $Req->Other_Reference;
$fincap = $Req->Fincap;
$revenuesubtype = $Req->POSubType;
$insurencestatus = (int)$Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
@ -1884,9 +1882,7 @@ if (!empty($getlogpodtl)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -2015,7 +2011,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right: 0px;">
<div class="col-md-12" style="padding-right: 0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -2026,16 +2022,6 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'editfincap', 'value' => set_value('editfincap', $fincap), 'id' => 'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

20
app/Views/editServiceAmendPO.php
View File

@ -33,7 +33,6 @@ $ModeOfShipment = '';
$SupplierReference = '';
$SuppliersOfferNo = '';
$OtherReferences = '';
$Fincap = '';
$InsuranceOptions = '';
$InsuranceNumber = '';
$ServiceTypeOptions = '';
@ -81,7 +80,6 @@ if (!empty($POMaster)) {
$SupplierReference = $Req->Supplier_Reference;
$SuppliersOfferNo = $Req->Supplier_Offer_No;
$OtherReferences = $Req->Other_Reference;
$Fincap = $Req->Fincap;
$InsuranceOptions = $Req->InsuranceStatus;
$InsuranceNumber = $Req->InsuranceNumber;
$ServiceTypeOptions = $Req->POSubType;
@ -180,7 +178,6 @@ foreach ($PaymentTerms as $TER) {
$('#amendsupplierreference').attr("style", "pointer-events: none;");
$('#amendsupplierofferno').attr("style", "pointer-events: none;");
$('#amendotherreference').attr("style", "pointer-events: none;");
$('#amendfincap').attr("style", "pointer-events: none;");
$('#PoTypeOptions').attr("style", "pointer-events: none;");
$('#InsuranceNumber').attr("style", "pointer-events: none;");
@ -699,10 +696,7 @@ foreach ($PaymentTerms as $TER) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -862,7 +856,7 @@ foreach ($PaymentTerms as $TER) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -873,16 +867,6 @@ foreach ($PaymentTerms as $TER) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap', 'value' => set_value('amendfincap', $Fincap), 'id' => 'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

19
app/Views/editimportpo.php
View File

@ -120,7 +120,6 @@ $Shipmentmode='';
$SupplierRef='';
$SupOfferno='';
$Otherref='';
$Fincap='';
$BudgetType = '';
if(!empty($POMaster))
@ -164,7 +163,6 @@ if(!empty($POMaster))
$SupplierRef=$Req->Supplier_Reference;
$SupOfferno=$Req->Supplier_Offer_No;
$Otherref=$Req->Other_Reference;
$Fincap=$Req->Fincap;
$Insurance=$Req->InsuranceStatus;
$InsuranceNumber=$Req->InsuranceNumber;
@ -475,10 +473,7 @@ else
if(!empty($Suplist))
{
foreach ($Suplist as $SID):
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.')' : '');
endforeach;
}
@ -696,7 +691,7 @@ else
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right:0px;">
<div class="col-md-12" style="padding-right:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -707,16 +702,6 @@ else
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

33
app/Views/editrequisitionform.php
View File

@ -239,7 +239,7 @@ if (!empty($ReqPOType)) {
</center>
</div>
<div align="left">
<div class="col-md-6">
<div class="col-md-12" style="padding: 20px;">
<label>Material Code</label>
<div>
<?php
@ -254,7 +254,9 @@ if (!empty($ReqPOType)) {
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
@ -263,7 +265,7 @@ if (!empty($ReqPOType)) {
?>
</div>
</div>
<div class="col-md-6" id="otherDescription" style="display:none;">
<div class="col-md-4" id="otherDescription" style="display:none;">
<label>Other Description</label>
<div class="form-group">
<?php
@ -272,7 +274,7 @@ if (!empty($ReqPOType)) {
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>UOM</label>
<div>
<?php
@ -282,7 +284,7 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>Quantity</label>
<div class="form-group">
<?php
@ -292,6 +294,7 @@ if (!empty($ReqPOType)) {
</div>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success font addClick" ID="addClick"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
@ -314,7 +317,7 @@ if (!empty($ReqPOType)) {
</div>
<div align="left">
<div class="col-md-6">
<div class="col-md-12" style="padding: 20px;">
<label>Material Code</label>
<div>
<?php
@ -324,7 +327,9 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
@ -334,9 +339,7 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-6" id="EditotherDescription">
<div class="col-md-4" id="EditotherDescription">
<label>Other Description</label>
<div class="form-group">
<?php
@ -349,10 +352,7 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>UOM</label>
<div>
<?php
@ -362,7 +362,8 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>Quantity</label>
<div class="form-group">
<?php
@ -371,7 +372,7 @@ if (!empty($ReqPOType)) {
?>
</div>
</div>
</div>
</div>

17
app/Views/importpo.php
View File

@ -309,10 +309,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
//print_r( $options);
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -506,7 +503,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right:0px;">
<div class="col-md-12" style="padding-right:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -517,16 +514,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'addfincap', 'value' => set_value('addfincap'), 'id' => 'addfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

1
app/Views/importpopdf.php
View File

@ -102,7 +102,6 @@
$supplierPAN=$PO->PAN;
$SupplierContact=$PO->ContactNumber;
$supplierGST=$PO->GSTNO;
$finCap=$PO->Fincap;
$ModeOfShipment=$PO->Mode_Of_Shipment;
$Supplier_Reference=$PO->Supplier_Reference;

17
app/Views/includes/pdfheader.php
View File

@ -25,7 +25,6 @@ $totaltaxamount = 0.00;
$PaymentOtherDescription = '';
$NoOfServices = 0;
$advance = 0;
$finCap = '-';
$modShp = '';
$insNo = '';
$insNo = '';
@ -106,7 +105,6 @@ if (!empty($POItem)) {
}
$advance = $PO->AdvanceAmount;
$finCap = ($PO->Fincap == '') ? '-' : $PO->Fincap;
$modShp = $PO->Mode_Of_Shipment;
if ($PO->InsuranceNumber == '') {
$insNo = 'No';
@ -304,21 +302,6 @@ if (!empty($POItem)) {
</tbody>
</table>
</td>
<td style="width: 70px; border-left: 1px solid black;">
<table style="border: none; width: 100%;">
<thead style="width: 70px;">
<tr style="background-color: #d2d2d2;">
<th style="border: none;">Fin cap </th>
</tr>
</thead>
<tbody style="text-align: center;border: none;">
<tr>
<td style="border: none;text-align: center;"><?php echo $finCap; ?></td>
</tr>
</tbody>
</table>
</td>
</tr>
<?php }
} ?>

99
app/Views/inwardgateregister.php
View File

@ -77,6 +77,7 @@
<section class="content" style="margin: 15px;"><br/>
<div style="border:2px solid #333;">
<form action ="<?php echo base_url()?>SaveIGR"
method="post" enctype="multipart/form-data">
<div class="row"><br/><br/>
@ -183,8 +184,6 @@
<div class="col-md-12" style="margin-top: 10px;">
<!-- <input type="button" class="btn btn-primary" id ="addemorebutton" value=" + ADD FILES.."> -->
<!-- <div id="newsdiv"></div>this div for add more section -->
<input type="hidden" name="hidecounters" id="hidecounters" value="0" />
<input type="hidden" name="hideconstants" id="hideconstants" value="0" />
@ -192,7 +191,6 @@
</div>
<div class="row">
<div class="col-md-12">
@ -221,33 +219,8 @@
</table>
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<!--<input type="text" id="tablevalues" value="sample" name="tablevalues"/>
<div class="col-md-12">-->
<!--<table id="specialtable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >-->
<!--<thead style="background-color:#ddf">
<tr>
<th>MaterialCode1</th>
<th>DeliveryChallanDate</th>
<th>DeliveryChallanNo</th>
<th>VehicleNo</th>
<th>CourierNo</th>
<th>Quantity12</th>
<th>File</th>
</tr>
</thead>-->
<!-- <div class="col-md-1 col-md-offset-10">
<button class="btn btn-primary" id='IGRLink' type="submit" name='IGRLink' onclick="filecheck();">Generate IGR</button>
</div> -->
<div class="col-md-4 col-md-offset-8">
<input type="file" name="browseFiles1" id="images1" onchange="Copyfilenames(this.name); "><br>
<button class="btn btn-success" id='IGRDraftLink' type="submit" name='IGRDraftLink' onclick="filecheck(0);">Draft IGR</button>
@ -255,10 +228,8 @@
</div>
</div>
</div>
</div>
</form>
<!-- form closed-->
<div class="modal fade" id="generateIGR" role="dialog">
<div class="modal-dialog modal_style">
@ -285,7 +256,7 @@
</form><!-- form closed-->
</div><!-- modal content closed-->
</div><!-- modal fade closed-->
<!-- new modal ended-->
<!-- generateIGR modal ended-->
<div class="modal fade" id="WeightCalculator" role="dialog">
<div class="modal-dialog modal_style">
@ -365,8 +336,10 @@
</div>
<!-- WeightCalculator modal ended-->
</div>
</section>
</div>
@ -758,45 +731,13 @@ function isNumberKey(evt)
function Save(status)
{
// alert("save function worked "+status);
//alert("save function worked ");
// var file = $('#images'+counterConstants).val()
if (validate())
{
var file = $('#images'+counterConstants).val()
// alert($('#Inwardgateregistertable').rows.count);
//alert(" if condition validation part ");
// $('#content').loader('show');
// $.ajax({
// data:$('.IGR').serialize(),
// type:"POST",
// url:"<?php echo base_url() ?>SaveIGR",
// success:function(data) {
// if(data){
// $('#content').loader('hide');
// document.getElementById('finaligr').innerHTML=data;
// $('#generateIGR').modal('show');
// }
// else
// {
// alert("Error");
// }
//var file = $('#images'+counterConstants).val();
// }//success function closed
// });//ajax closed
//var tablevalue = $('#specialtable').tableToJSON(); // Convert the table into a javascript object
//var jsondata = JSON.stringify(tablevalue);
//$('#tablevalues').val(jsondata);
// $("#IGR").attr("method", "post");
// $("#IGR").attr("enctype", "multipart/form-data");
// $("#IGR").attr("action", "SaveIGR");
// $('#IGR').submit();
$("#IGR").attr("method", "post");
$("#IGR").attr("enctype", "multipart/form-data");
$("#IGR").attr("action", "SaveIGR");
$('#IGR').submit();
}//validate if closed
}//save function closed
@ -941,36 +882,16 @@ function filecheck(status)
$('#hidecounters').val(1);
$('#hideconstants').val(1);
//alert(counterConstants);
var file1 = $('#images').val();
//alert(myfile);
if(file1=='')
{
alert('File not Found');
//Save();
}
else
{
Save(status);
}
// var sizef = document.getElementById('myfile').files[0].size;
// var myfile = $('#myfile').val();
// if(myfile!='' && sizef < 2100000)
// {
// alert('Your file added successfully');
// Save();
// }
// else
// {
// alert('Sorry Your File is Large To 2MB');
// $('#myfile').val('');
// }
// }
}

1
app/Views/po_pdf.php
View File

@ -153,7 +153,6 @@
$ourRef = (!empty($POItem) && !empty($POItem[0]->Other_Reference)) ? $POItem[0]->Other_Reference : "-";
$dispatch = (!empty($POItem) && !empty($POItem[0]->Import_DispatchDetails)) ? $POItem[0]->Import_DispatchDetails : "";
$advance = (!empty($POItem) && !empty($POItem[0]->AdvanceAmount)) ? $POItem[0]->AdvanceAmount : "-";
$finCap = (!empty($POItem) && !empty($POItem[0]->Fincap)) ? $POItem[0]->Fincap : "-";
$modShp = (!empty($POItem) && !empty($POItem[0]->Mode_Of_Shipment)) ? $POItem[0]->Mode_Of_Shipment : "-";
$insNo = (!empty($POItem) && !empty($POItem[0]->InsuranceNumber)) ? $POItem[0]->InsuranceNumber : 'No';
$PaymentTerms = (!empty($POItem) && !empty($POItem[0]->PaymentTerms)) ? ($POItem[0]->PaymentTerms == 'Others' ? $POItem[0]->PaymentOtherDescription : $POItem[0]->PaymentTerms) : "";

25
app/Views/purchaseorder.php
View File

@ -1825,11 +1825,7 @@ if (!empty($INRSYMBOL)) {
<section class="content">
<div style="border:2px solid #333">
<div id="content"></div>
<div>
<center><b>
<h2>Revenue Purchase Order</h2>
</b></center>
</div>
<div> <center><b> <h2>Revenue Purchase Order</h2> </b></center> </div>
<div class="col-md-12 text-right" style="padding-bottom:6px; padding-right:29px;">
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
</div>
@ -1843,13 +1839,11 @@ if (!empty($INRSYMBOL)) {
$options = array("0" => 'Selected Requisition Numbers');
if (!empty($ReqList)) {
foreach ($ReqList as $SID) :
$options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
$ReqType = $SID->ReqType;
endforeach;
}
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
?>
</div>
<div class="col-md-12" style="padding:0px;">
@ -1872,10 +1866,7 @@ if (!empty($INRSYMBOL)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -2010,7 +2001,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding-right: 0px;">
<div class="col-md-12" style="padding-right: 0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -2021,16 +2012,6 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'addfincap', 'value' => set_value('addfincap'), 'id' => 'addfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

34
app/Views/requisitionform.php
View File

@ -197,7 +197,7 @@ if (!empty($Emp)) {
</center>
</div>
<div align="left">
<div class="col-md-6">
<div class="col-md-12" style="padding: 20px;">
<label>Material Code</label>
<div>
<?php
@ -213,7 +213,8 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
@ -225,7 +226,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-6" id="otherDescription" style="display:none;">
<div class="col-md-4" id="otherDescription" style="display:none;">
<label>Other Description</label>
<div class="form-group">
<?php
@ -234,7 +235,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>UOM</label>
<div>
<?php
@ -244,7 +245,7 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>Quantity</label>
<div class="form-group">
<?php
@ -254,6 +255,7 @@ if (!empty($Emp)) {
</div>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success font addClick"><span class="bold">Add</span></a>
@ -276,17 +278,18 @@ if (!empty($Emp)) {
</div>
<div align="left">
<div class="col-md-6">
<div class="col-md-12" style="padding: 20px;">
<label>Material Code</label>
<div>
<?php
$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control', 'readonly' => 'true');
$data = array('value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
@ -295,10 +298,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-6" id="EditotherDescription">
<div class="col-md-4" id="EditotherDescription">
<label>Other Description</label>
<div class="form-group">
<?php
@ -307,10 +307,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>UOM</label>
<div>
<?php
@ -320,7 +317,7 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-6">
<div class="col-md-4">
<label>Quantity</label>
<div class="form-group">
<?php
@ -329,6 +326,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
</div>
</div>

2
app/Views/revenuepopdf.php
View File

@ -21,7 +21,6 @@
$advance=0;
$supOfferNo='';
$supRef = '';
$finCap='';
$modeofshipment='';
$InsuranceNumber='';
$companyWebsit='';
@ -88,7 +87,6 @@
$ServiceDescription =$PO->ServiceDescription;
$supOfferNo = $PO->Supplier_Offer_No;
$supRef = $PO->Supplier_Reference;
$finCap = $PO->Fincap;
$modeofshipment = $PO->Mode_Of_Shipment;
$PaymentTerms = $PO->PaymentTerms;

16
app/Views/servicePurchaseorder.php
View File

@ -662,10 +662,7 @@ if (!empty($INRSYMBOL)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
endforeach;
}
@ -811,7 +808,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<label>Our Reference(S)</label>
<div class="form-group">
@ -822,16 +819,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'addfincap', 'value' => set_value('addfincap'), 'id' => 'addfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>

2
app/Views/servicepopdf.php
View File

@ -26,7 +26,6 @@
$PaymentOtherDescription='';
$NoOfServices=0;
$advance=0;
$finCap='';
$modShp='';
$insNo='';
$insNo='';
@ -116,7 +115,6 @@
$advance=$PO->AdvanceAmount;
$finCap=$PO->Fincap;
$modShp=$PO->Mode_Of_Shipment;
$insNo=$PO->InsuranceNumber;