diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index e2513477..f4c69c1c 100755 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -162,7 +162,7 @@ class emergencypurchaseorder extends BaseController // PO Master $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$ServiceWorkStatus,'POType'=>$POType,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'Description_Of_Service'=>$DescriptionOfPo,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$ServiceTypeOptions); $PONO = ''; if(count($POMaster)>0) { @@ -330,7 +330,7 @@ class emergencypurchaseorder extends BaseController // PO Master $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Supplier_Reference'=>$supplierreference,'Other_Reference'=>$otherreference,'InsuranceNumber'=>$insuranceno,'InsuranceStatus'=>$insurancestatus,'Fincap'=>$fincap,'POSubType'=>$revenuetype); //print_r($POList); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$revenuetype); $PONO = ''; if(count($POMaster)>0) @@ -789,7 +789,7 @@ class emergencypurchaseorder extends BaseController $Deliverydt = $this->getDateformat($dt); $POType = $this->input->post('POType'); $PoRange = $this->input->post('txtPoRange'); - + $SpcialInstruction = $this->input->post('txtSpcialInstruction'); $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary'); $POStatus = $this->input->post('txtStatus'); diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index e79a6943..4eed3119 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -891,7 +891,7 @@ class purchaseorder extends BaseController // die(); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$revenuetype); $PONO = ''; if(count($POMaster)>0) @@ -1541,7 +1541,7 @@ function addNewImportPurchaseOrder() //print_r($POList); //die(); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$importoption); $PONO = ''; if(count($POMaster)>0) @@ -2159,7 +2159,7 @@ function addNewImportPurchaseOrder() // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'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,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$ServiceTypeOptions); $PONO = ''; if(count($POMaster)>0) diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index 8d7d7ddc..8d9e1747 100755 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -229,7 +229,7 @@ class servicepurchaseorder extends BaseController // PO Master $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'Description_Of_Service'=>$DescriptionOfPo,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions); - $POMaster = $this->purchaseorder_model->addPOMaster($POList); + $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$ServiceTypeOptions); $PONO = ''; if(count($POMaster)>0)