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

import po modification

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-06-29 10:31:20 +05:30
parent ecc550ce10
commit 9196389d56
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/controllers/purchaseorder.php
View File

@ -98,11 +98,9 @@ class purchaseorder extends BaseController
/** /**
* This function used to show the Purchase Order Screen * This function used to show the Purchase Order Screen
*/ */
function CreatePurchaseOrder() function CreatePurchaseOrder()
{ {
$this->form_validation->set_rules('txtReqNo', 'txtReqNo', 'callback_Req_validate'); $this->form_validation->set_rules('txtReqNo', 'txtReqNo', 'callback_Req_validate');
if($this->form_validation->run() == FALSE) if($this->form_validation->run() == FALSE)
@ -117,8 +115,14 @@ class purchaseorder extends BaseController
$data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
$data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
$data['Suplist'] = $this->purchaseorder_model->getSupplierName(); $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
//$data['Suplist'] = $this->purchaseorder_model->getSupplierName();
$data['Payment']=$this->purchaseorder_model->getSupplierPayment(); $data['Payment']=$this->purchaseorder_model->getSupplierPayment();
// foreach ($data['Suplist'] as $SUP)
// {
// $Detail=$SUP->PaymentTerms;
// }
//print_r($data['Payment']);
//print_r($data['Suplist']);
$SelectedReq = json_decode($this->input->post('txtReqNo')); $SelectedReq = json_decode($this->input->post('txtReqNo'));
$Req = $SelectedReq->Req; $Req = $SelectedReq->Req;
@ -136,6 +140,7 @@ class purchaseorder extends BaseController
$data['MaterialList'] = $result; $data['MaterialList'] = $result;
//print_r($data['MaterialList']);
/* Cost code from Requisition - Client Review Fix /* Cost code from Requisition - Client Review Fix
Start here */ Start here */
$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray); $ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
@ -162,6 +167,11 @@ class purchaseorder extends BaseController
// $data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate(); // $data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate();
$data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate(); $data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate();
$data['Currency']=$this->purchaseorder_model->GetCurrencytype(); $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
//print_r($data['Currency']);
// $data[$Rate->ExchangeRate]=$Rate->ExchangeRate;
//$data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
$ViewName = ''; $ViewName = '';
if($ReqType == REVENUE) if($ReqType == REVENUE)
@ -183,7 +193,6 @@ class purchaseorder extends BaseController
$this->loadViews($ViewName, $this->global,$data, NULL); $this->loadViews($ViewName, $this->global,$data, NULL);
} }
} }
function CreatePOPrint() function CreatePOPrint()
{ {
$PONO = $_GET['PONO']; $PONO = $_GET['PONO'];

2
application/models/purchaseorder_model.php
View File

@ -52,7 +52,7 @@ function purchaseorderListing()
*/ */
function getSupplierName($supID='') function getSupplierName($supID='')
{ {
$this->db->select('SupplierID, SupplierName,Address'); $this->db->select('SupplierID, SupplierName,Address,PaymentTerms,PayableAT,PaymentDays');
$this->db->from('T_SupplierDetailsN'); $this->db->from('T_SupplierDetailsN');
if($supID != '') if($supID != '')
{ {

10
application/views/importpo.php
View File

@ -74,11 +74,6 @@ if(!empty($AvlBudAmt))
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#PayableAT").datepicker({
minDate : m,
//maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
minDate : m, minDate : m,
@ -1729,7 +1724,10 @@ $('#drpSupplier').change(function() {
{ {
$("#SupAddress").val(obj.Address); $("#SupAddress").val(obj.Address);
$("#PayableAT").val(obj.PayableAT); $("#PayableAT").val(obj.PayableAT);
$("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) ); $("#PaymentTerms").val(obj.PaymentTerms);
//var a=$("PayableAT").val();
console.log(obj.PaymentTerms);
//$("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) );