diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index eda744f2..87293b62 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -168,12 +168,15 @@ class purchaseorder extends BaseController foreach ($FiscalYear as $Fy) { $FYStart =$Fy->StartYear; - $FYEnd =$Fy->EndYear; + //$FYEnd =$Fy->EndYear; + $FYEnd=$FYStart+1; } } $FYdt = $FYStart." - ".$FYEnd ; + + //echo $FYEnd; foreach ($ReqDetails as $Rs): $CostCode = $Rs->CostCenterCode; @@ -741,6 +744,9 @@ class purchaseorder extends BaseController // PO Master $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment); + //print_r($POList); + //die(); + $POMaster = $this->purchaseorder_model->addPOMaster($POList); @@ -777,7 +783,7 @@ class purchaseorder extends BaseController $TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $CostCenter = $this->input->post('costCode'.$i); $Cgst = $this->input->post('RevenueCgst'.$i); - $Sgst = $this->input->post('RevenueSgst'.$i); + $Sgst = $this->input->post('RevenueSgst'.$i); $Igst = $this->input->post('RevenueIgst'.$i); $AfterCgst = $this->input->post('RevenueAfterCgst'.$i); $AfterSgst = $this->input->post('RevenueAfterSgst'.$i); diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php index c31dcf0a..29ff27e9 100755 --- a/application/views/advancerequest.php +++ b/application/views/advancerequest.php @@ -44,7 +44,10 @@ $(function() { if(!empty($PONO)) { foreach ($PONO as $PO): - $options[$PO->PONO] =$PO->PONO; + $options[$PO->PONO] =$PO->PONO.' '.' - '.' '.$PO->POType; + + + //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName; endforeach; } @@ -202,6 +205,7 @@ var PONUM=$('#PurchaseOrderNumber').val(); credt=credt.split(' ')[0] $('#PoCreatedDate').val(credt); var reldt=obj.ReleasedOn; + //console.log(reldt); reldt=reldt.split(' ')[0]; $('#ReleasedOn').val(reldt);