diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index 739846b3..34d8c875 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -1393,9 +1393,11 @@ class Amendmentpurchaseorder extends BaseController } $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); + $file = $this->request->getFile('POFile'); $requestfilename = $file->getName(); $PrePOFile = $this->request->getPost('PrePOFile'); + if (!empty($requestfilename)) { if ($file && $file->isValid() && !$file->hasMoved()) { $path = ROOTPATH . 'public/uploads/POfiles/'; @@ -1415,6 +1417,9 @@ class Amendmentpurchaseorder extends BaseController } else { $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; } + + + $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $NewPO = ''; @@ -1431,7 +1436,7 @@ class Amendmentpurchaseorder extends BaseController $LineItemStatus = REQITEM_NEW; - $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); + $igrvalue = $this->purchaseorder_model->selectigrmaster($PONO); $po = ''; $igrno = ''; diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index b39d4c5d..dacd1a37 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -2941,7 +2941,6 @@ if (!empty($RequistionDetails)) { data: formData, processData: false, contentType: false, - //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus, type: "POST", url: "amendmentpurchaseorder/EditAmendImportPO", success: function(data) { diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 030bd12d..b98f859f 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -221,8 +221,7 @@ Item Count Invoice Qty - - Recieved Qty + Net weight Vechicle No Driver Transporter @@ -258,8 +257,7 @@ ReceivedQuantity ?> - - + NetWeight ?> VehicleNo ?>