SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

advance

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-02 18:43:20 +05:30
parent 0b7b3ecd9b
commit 0f29cec833
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/purchaseorder.php
View File

@ -168,13 +168,16 @@ class purchaseorder extends BaseController
foreach ($FiscalYear as $Fy) foreach ($FiscalYear as $Fy)
{ {
$FYStart =$Fy->StartYear; $FYStart =$Fy->StartYear;
$FYEnd =$Fy->EndYear; //$FYEnd =$Fy->EndYear;
$FYEnd=$FYStart+1;
} }
} }
$FYdt = $FYStart." - ".$FYEnd ; $FYdt = $FYStart." - ".$FYEnd ;
//echo $FYEnd;
foreach ($ReqDetails as $Rs): foreach ($ReqDetails as $Rs):
$CostCode = $Rs->CostCenterCode; $CostCode = $Rs->CostCenterCode;
endforeach; endforeach;
@ -741,6 +744,9 @@ class purchaseorder extends BaseController
// PO Master // 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); $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); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -777,7 +783,7 @@ class purchaseorder extends BaseController
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
$Cgst = $this->input->post('RevenueCgst'.$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); $Igst = $this->input->post('RevenueIgst'.$i);
$AfterCgst = $this->input->post('RevenueAfterCgst'.$i); $AfterCgst = $this->input->post('RevenueAfterCgst'.$i);
$AfterSgst = $this->input->post('RevenueAfterSgst'.$i); $AfterSgst = $this->input->post('RevenueAfterSgst'.$i);

6
application/views/advancerequest.php
View File

@ -44,7 +44,10 @@ $(function() {
if(!empty($PONO)) if(!empty($PONO))
{ {
foreach ($PONO as $PO): foreach ($PONO as $PO):
$options[$PO->PONO] =$PO->PONO; $options[$PO->PONO] =$PO->PONO.' '.' - '.' '.$PO->POType;
//$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
endforeach; endforeach;
} }
@ -202,6 +205,7 @@ var PONUM=$('#PurchaseOrderNumber').val();
credt=credt.split(' ')[0] credt=credt.split(' ')[0]
$('#PoCreatedDate').val(credt); $('#PoCreatedDate').val(credt);
var reldt=obj.ReleasedOn; var reldt=obj.ReleasedOn;
//console.log(reldt);
reldt=reldt.split(' ')[0]; reldt=reldt.split(' ')[0];
$('#ReleasedOn').val(reldt); $('#ReleasedOn').val(reldt);