From 085637804148f292d8737b886909dac4822815fe Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 26 Jul 2024 12:05:04 +0000 Subject: [PATCH 1/6] Fix_PO List : ps --- app/Views/POlist.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/app/Views/POlist.php b/app/Views/POlist.php index 0cb2ba8f..09c84bd4 100644 --- a/app/Views/POlist.php +++ b/app/Views/POlist.php @@ -225,20 +225,4 @@ ] }); }); - - \ No newline at end of file + \ No newline at end of file From de6dd71394944028a02ebacfc4a516eb65a52d06 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 27 Jul 2024 09:38:50 +0000 Subject: [PATCH 2/6] FIX_TareWeightDate in IGR : ps --- app/Controllers/Inwardgateregister.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 6ebc72d9..fe55e59a 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -439,13 +439,10 @@ class Inwardgateregister extends BaseController // var_dump($grossWeightDate); // var_dump($tareWeightDate); - if (is_string($grossWeightDate) && is_string($tareWeightDate)) { - $GrossWeightDate = date('Y-m-d H:i:s', strtotime($grossWeightDate)); - $TareWeightDate = date('Y-m-d H:i:s', strtotime($tareWeightDate)); - } else { - $GrossWeightDate = null; - $TareWeightDate = null; - } + $GrossWeightDate = !empty($grossWeightDate) && is_string($grossWeightDate) ? date('Y-m-d H:i:s', strtotime($grossWeightDate)) : null; + $TareWeightDate = !empty($tareWeightDate) && is_string($tareWeightDate) ? date('Y-m-d H:i:s', strtotime($tareWeightDate)) : null; + log_message('error', "TareWeightDate" . $TareWeightDate); + if (strlen($QuantityAsPerInvoice) > 0 && $QuantityAsPerInvoice != '0') { $Remarks = $this->request->getPost('txtRemarks' . $i); $ItemStatus = ''; From 9cd30ab31c719b981e6cab1731487876b2e17d58 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 29 Jul 2024 10:38:12 +0000 Subject: [PATCH 3/6] FIX_FIncap Remove, Matedical code field enlarged,supplier MSME added in po --- app/Controllers/Amendmentpurchaseorder.php | 8 +- app/Controllers/Emergencypurchaseorder.php | 4 +- app/Controllers/Purchaseorder.php | 12 +- app/Controllers/Servicepurchaseorder.php | 4 +- app/Models/Inwardgateregister_model.php | 3 + app/Models/Purchaseorder_model.php | 2 +- app/Views/EditservicePurchaseorder.php | 20 +- app/Views/alterpurchaseorder.php | 14 +- app/Views/capitalpopdf.php | 2 - app/Views/capitalpurchaseorder.php | 21 +- app/Views/editCapitalAmendPO.php | 22 +- app/Views/editCapitalPo.php | 22 +- app/Views/editImportAmendPO.php | 16 +- app/Views/editRevenueAmendPO.php | 18 +- app/Views/editRevenuepurchaseorder.php | 18 +- app/Views/editServiceAmendPO.php | 20 +- app/Views/editimportpo.php | 19 +- app/Views/editrequisitionform.php | 163 +++--- app/Views/importpo.php | 17 +- app/Views/importpopdf.php | 1 - app/Views/includes/pdfheader.php | 17 - app/Views/inwardgateregister.php | 551 +++++++++------------ app/Views/po_pdf.php | 1 - app/Views/purchaseorder.php | 41 +- app/Views/requisitionform.php | 142 +++--- app/Views/revenuepopdf.php | 2 - app/Views/servicePurchaseorder.php | 18 +- app/Views/servicepopdf.php | 2 - 28 files changed, 447 insertions(+), 733 deletions(-) diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index 1d152eda..32b602e8 100644 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -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'); diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 6d70d46d..d76f84e0 100644 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -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) { diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index be3dd064..778cf207 100644 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -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'); diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 6af4c29f..490290e2 100644 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -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'); diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index a60d77b6..850309a7 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -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') diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index 78914f1e..2e2c3114 100644 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -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); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 0a5b683f..32bdc4a6 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -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)) {
-
+
@@ -946,16 +941,7 @@ if (!empty($getlogpodtl)) { ?>
-
- -
- - 'editfincap', 'value' => set_value('editfincap', $Fincap), 'id' => 'editfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
+
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 5795041b..ff6706a2 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -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)) {
-
+
@@ -2372,16 +2372,6 @@ if (!empty($INRSYMBOL)) { ?>
-
- -
- - 'emergfincap', 'value' => set_value('emergfincap'), 'id' => 'emergfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/capitalpopdf.php b/app/Views/capitalpopdf.php index 7d06cbe5..7142d2e1 100644 --- a/app/Views/capitalpopdf.php +++ b/app/Views/capitalpopdf.php @@ -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'; diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index cfe646bd..add043b7 100644 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -386,11 +386,8 @@ function vaildateBeforeOpenModal() if(!empty($Suplist)) { foreach ($Suplist as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - - endforeach; + $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : ''); + endforeach; } echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); @@ -610,9 +607,9 @@ function vaildateBeforeOpenModal()
-
+
- +
-
- -
- - 'addfincap','value' => set_value('addfincap'),'id'=>'addfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 9738c6aa..81d3723a 100644 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -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,9 +702,9 @@ document.getElementById('dispatchinternational').style.display = 'block';
-
+
- +
-
- -
- - 'amendfincap','value' => set_value('amendfincap',$Fincap),'id'=>'amendfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index c9c63dca..41312024 100644 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -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,9 +749,9 @@ $("#PaymentMethod").select2();
-
+
- +
-
- -
- - 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
+
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index c8e05024..ba2a35ca 100644 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -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)) ?> -
- -
- - 'amendfincap','value' => set_value('amendfincap',$Fincap),'id'=>'amendfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 29d6d2ac..d39912c2 100644 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -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() ?> -
- -
- - 'amendfincap','value' => set_value('amendfincap',$fincap),'id'=>'amendfincap', 'class' => 'form-control','readonly' => 'readonly'); - echo form_input($data); - ?> -
-
+ diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 10070e49..e4c2d657 100644 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -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)) {
-
+
@@ -2026,16 +2022,6 @@ if (!empty($getlogpodtl)) { ?>
-
- -
- - 'editfincap', 'value' => set_value('editfincap', $fincap), 'id' => 'editfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index bee04251..5f592880 100644 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -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) {
-
+
@@ -873,16 +867,6 @@ foreach ($PaymentTerms as $TER) { ?>
-
- -
- - 'amendfincap', 'value' => set_value('amendfincap', $Fincap), 'id' => 'amendfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index e6fada16..f6026f02 100644 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -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
-
+
@@ -707,16 +702,6 @@ else ?>
-
- -
- - 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index aaec5925..5ca339bc 100644 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -239,7 +239,7 @@ if (!empty($ReqPOType)) {
-
+
-
- -
- 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- -
- -
- 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> +
+
+ +
+ 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
-
- -
- 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event)', 'maxlength' => '20' , 'min' => '1'); - echo form_input($data); - ?> + +
+ +
+ 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+
+ +
+ 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event)', 'maxlength' => '20' , 'min' => '1'); + echo form_input($data); + ?> +
@@ -314,7 +317,7 @@ if (!empty($ReqPOType)) {
-
+
-
- -
- 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> +
+
+ + +
+ 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ +
+ +
+ 'EditotherD','value' => set_value('EditotherD'),'id'=>'EditotherD', 'class' => 'form-control','readonly'=>'true' ); + // echo form_input($data); + + $data = array('name' => 'EditotherD', 'value' => set_value('EditotherD'), 'id' => 'EditotherD', 'class' => 'form-control', 'rows' => '5', 'cols' => '70', 'maxlength' => '500'); + echo Form_textarea($data); + ?> +
+
+ +
+ +
+ 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+ +
+ +
+ 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event)', 'maxlength' => '20' , 'min' => '1'); + echo form_input($data); + ?> +
- - -
- -
- 'EditotherD','value' => set_value('EditotherD'),'id'=>'EditotherD', 'class' => 'form-control','readonly'=>'true' ); - // echo form_input($data); - - $data = array('name' => 'EditotherD', 'value' => set_value('EditotherD'), 'id' => 'EditotherD', 'class' => 'form-control', 'rows' => '5', 'cols' => '70', 'maxlength' => '500'); - echo Form_textarea($data); - ?> -
-
- - - - -
- -
- 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> - -
-
-
- -
- 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event)', 'maxlength' => '20' , 'min' => '1'); - echo form_input($data); - ?> -
-
- -
diff --git a/app/Views/importpo.php b/app/Views/importpo.php index 4faef64f..b21016f5 100644 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -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)) {
-
+
@@ -517,16 +514,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { ?>
-
- -
- - 'addfincap', 'value' => set_value('addfincap'), 'id' => 'addfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/importpopdf.php b/app/Views/importpopdf.php index ba5e0d12..33e5e6bf 100644 --- a/app/Views/importpopdf.php +++ b/app/Views/importpopdf.php @@ -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; diff --git a/app/Views/includes/pdfheader.php b/app/Views/includes/pdfheader.php index 276ebbec..b049d09f 100644 --- a/app/Views/includes/pdfheader.php +++ b/app/Views/includes/pdfheader.php @@ -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)) { - - - - - - - - - - - - -
Fin cap
- - diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 4398131a..c1068df6 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -75,191 +75,162 @@

-
- -
-


-
-
-
-
- - - - -
- 'Purchase Order No'); - if(!empty($PO_NO)){ - //print_r($PO_NO); - foreach ($PO_NO as $SI): - $options[$SI->PONO] = $SI->PONO .'-'. $SI->SupplierName ; - $PONO = $SI->PONO; - endforeach; - } - echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"'); - ?> - -
- -
- -
- 'SupplierName','value' => set_value('SupplierName'),'id'=>'Sup', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- - 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' ); // ,'onkeypress'=>'return isNumberKey(event);' ); - echo form_input($data); - ?> -
-
- - 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' ); - echo form_input($data); - ?> -
-
- - 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control num', 'required'=>'true' ); - echo form_input($data); - ?> -
-
-
-
- - 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', 'maxlength' => '20' ); - echo form_input($data); - ?> - -
-
- - 'DriverName','value' => set_value('DriverName'), 'id'=>'DriverName', 'class' => 'form-control', 'maxlength' => '50' ); - echo form_input($data); - ?> -
-
- - 'DriverMobileNumber','value' => set_value('DriverMobileNumber'), 'id'=>'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50' ); - echo form_input($data); - ?> -
- -
- +
- -
- -
- - - - - - - - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - -
#Item CodeMaterialUOMOrdered QuantityReceived QuantityBalance QuantityInvoice QuantityRemarks
- - - - - - - - - - - -
-
- - + +


+
+
+
+
+ + + + +
+ 'Purchase Order No'); + if(!empty($PO_NO)){ + //print_r($PO_NO); + foreach ($PO_NO as $SI): + $options[$SI->PONO] = $SI->PONO .'-'. $SI->SupplierName ; + $PONO = $SI->PONO; + endforeach; + } + echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"'); + ?> + +
+ +
+ +
+ 'SupplierName','value' => set_value('SupplierName'),'id'=>'Sup', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
-
-
- -
- +
+
+ + 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' ); // ,'onkeypress'=>'return isNumberKey(event);' ); + echo form_input($data); + ?> +
+
+ + 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' ); + echo form_input($data); + ?> +
+
+ + 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control num', 'required'=>'true' ); + echo form_input($data); + ?> +
+
+
+
+ + 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', 'maxlength' => '20' ); + echo form_input($data); + ?> + +
+
+ + 'DriverName','value' => set_value('DriverName'), 'id'=>'DriverName', 'class' => 'form-control', 'maxlength' => '50' ); + echo form_input($data); + ?> +
+
+ + 'DriverMobileNumber','value' => set_value('DriverMobileNumber'), 'id'=>'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50' ); + echo form_input($data); + ?> +
+ +
+ + + + +
+ +
+ + + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
#Item CodeMaterialUOMOrdered QuantityReceived QuantityBalance QuantityInvoice QuantityRemarks
+ + + + +
+
+ + +
+
+
+ + - - + - - -
+
+
@@ -758,46 +731,14 @@ 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:"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(); - }//validate if closed + var file = $('#images'+counterConstants).val() + $("#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(); + alert('File not Found'); } 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(''); - // } - - // } - - + } } diff --git a/app/Views/po_pdf.php b/app/Views/po_pdf.php index 52b91b37..ceee0f76 100755 --- a/app/Views/po_pdf.php +++ b/app/Views/po_pdf.php @@ -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) : ""; diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index f3180a57..685b0081 100644 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -1825,11 +1825,7 @@ if (!empty($INRSYMBOL)) {
-
-
-

Revenue Purchase Order

-
-
+

Revenue Purchase Order

Back
@@ -1840,16 +1836,14 @@ if (!empty($INRSYMBOL)) {
'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"'); - + $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"'); ?>
@@ -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)) {
-
+
@@ -2021,16 +2012,6 @@ if (!empty($INRSYMBOL)) { ?>
-
- -
- - 'addfincap', 'value' => set_value('addfincap'), 'id' => 'addfincap', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 57a73c52..930f88a3 100644 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -197,7 +197,7 @@ if (!empty($Emp)) {
-
+
-
- -
- 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); +
+
+ +
+ 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); - ?> + ?> +
-
-