SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-06-19 18:34:44 +05:30
parent f9e02dfef0
commit c8d3e82f41
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/requisitionform.php
View File

@ -39,6 +39,9 @@ class requisitionform extends BaseController
$data['TotNoOfLine'] =$this->requistion_model->getRequistionList($userID); $data['TotNoOfLine'] =$this->requistion_model->getRequistionList($userID);
$this->loadViews("requisitionlisting", $this->global, $data, NULL); $this->loadViews("requisitionlisting", $this->global, $data, NULL);
} }
/** /**
@ -94,11 +97,9 @@ class requisitionform extends BaseController
$userID = $this->session->userdata ( 'userId' ); $userID = $this->session->userdata ( 'userId' );
$data['ReqDetails'] = $this->requistion_model->getRequistDetails($ReqNo,'Yes'); $data['ReqDetails'] = $this->requistion_model->getRequistDetails($ReqNo,'Yes');
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
//print_r( $data['LineItem']);
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID); $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
@ -318,7 +319,7 @@ class requisitionform extends BaseController
//echo 'Not Exists'; //echo 'Not Exists';
$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy); $Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
print_r($Request); //print_r($Request);
$Req = $this->requistion_model->addRequistion($Request); $Req = $this->requistion_model->addRequistion($Request);
} }

14
application/controllers/servicepurchaseorder.php
View File

@ -1,3 +1,5 @@
<?php if(!defined('BASEPATH')) exit('No direct script access allowed'); <?php if(!defined('BASEPATH')) exit('No direct script access allowed');
require APPPATH . '/libraries/BaseController.php'; require APPPATH . '/libraries/BaseController.php';
@ -69,15 +71,6 @@ class servicepurchaseorder extends BaseController
$DeliveryAddr = $this->input->post('DeliveryAddr'); $DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydt');
$Deliverydt = $this->getDateformat($dt); $Deliverydt = $this->getDateformat($dt);
$DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1){
$Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby');
}
else{
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$SpcialInstruction = $this->input->post('txtSpcialInstruction'); $SpcialInstruction = $this->input->post('txtSpcialInstruction');
@ -93,8 +86,7 @@ $DeliveryOption = $this->input->post('DateRange');
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,Delivery'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt ); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);