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

master module changes-1 vadivel J 20-12-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-12-20 09:34:40 +05:30
parent 37ed0276bf
commit 858629d58e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/Amendmentpurchaseorder.php
View File

@ -1393,9 +1393,11 @@ class Amendmentpurchaseorder extends BaseController
} }
$AmendmentNewPoNo = generate_amendment_po_number($PONO); $AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $changeStatus , '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, 'IsQualityChkReqired' => $qtycheckresult); $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $changeStatus , '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, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile'); $PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) { if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) { if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/'; $path = ROOTPATH . 'public/uploads/POfiles/';
@ -1415,6 +1417,9 @@ class Amendmentpurchaseorder extends BaseController
} else { } else {
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
} }
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO = ''; $NewPO = '';
@ -1431,7 +1436,7 @@ class Amendmentpurchaseorder extends BaseController
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
$igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO);
$po = ''; $po = '';
$igrno = ''; $igrno = '';

1
app/Views/editImportAmendPO.php
View File

@ -2941,7 +2941,6 @@ if (!empty($RequistionDetails)) {
data: formData, data: formData,
processData: false, processData: false,
contentType: false, contentType: false,
//data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
type: "POST", type: "POST",
url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO", url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
success: function(data) { success: function(data) {

6
app/Views/viewinwardgateregister.php
View File

@ -221,8 +221,7 @@
<th style="display:none;">Item Count</th> <th style="display:none;">Item Count</th>
<!-- Rec qty changed to invoice qty --> <!-- Rec qty changed to invoice qty -->
<th>Invoice Qty</th> <th>Invoice Qty</th>
<!-- net weight changed to received qty --> <th>Net weight</th>
<th>Recieved Qty</th>
<th>Vechicle No</th> <th>Vechicle No</th>
<th>Driver</th> <th>Driver</th>
<th>Transporter</th> <th>Transporter</th>
@ -258,8 +257,7 @@
<!-- below one is currently shown as invoice qty --> <!-- below one is currently shown as invoice qty -->
<td align="right"><?php echo (int)$record->ReceivedQuantity ?></td> <td align="right"><?php echo (int)$record->ReceivedQuantity ?></td>
<!-- below one is currently shown as received qty -->
<td align="right"><?php echo (int)$record->NetWeight ?></td> <td align="right"><?php echo (int)$record->NetWeight ?></td>
<td><?php echo $record->VehicleNo ?></td> <td><?php echo $record->VehicleNo ?></td>