diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 465ca1a0..efa32b32 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -6,7 +6,7 @@ require APPPATH . '/third_party/mpdf/mpdf.php'; /** * Class : purchaseorder (Purchase order - Controller) * purchaseorder Class to control all po related operations. - * @author : Venba InfoTech + * @author : Venba InfoTech * @version : 1.1 * @since : 18 November 2017 */ @@ -1114,8 +1114,7 @@ class purchaseorder extends BaseController $Qualitycheck=1; // PO Master - $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,' - IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType); + $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $LineItemStatus = REQITEM_NEW; diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index 4701d495..ccff887d 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -36,6 +36,7 @@ array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1") $InsuranceNo=''; $ServiceTypeOptions=''; $DescriptionOfPo = ''; + $BudgetType = ''; if(!empty($INRSYMBOL)) @@ -88,6 +89,7 @@ if(!empty($POMaster)) $InsuranceNo=$Req->InsuranceNumber; $ServiceTypeOptions=$Req->POSubType; $DescriptionOfPo = $Req->Description_Of_Service; + $BudgetType = $Req->BudgetType; } } @@ -529,15 +531,15 @@ function ExceedQuantityCheck() var ReqAmount = parseFloat(ValuetoCheck); var BudAmount = parseFloat(budgetAmount); - if(ReqAmount > BudAmount ) - { - swal('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.'); - return false; - } - else - { + // if(ReqAmount > BudAmount ) + // { + // swal('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.'); + // return false; + // } + // else + // { return true; - } + //} } function calculateServiceTax(varBasicValue) { @@ -1074,7 +1076,28 @@ $(document).ready(function () { - + +