diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index e16b0ee6..e70cf170 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -98,10 +98,8 @@ class purchaseorder extends BaseController /** * This function used to show the Purchase Order Screen */ - - function CreatePurchaseOrder() + function CreatePurchaseOrder() { - $this->form_validation->set_rules('txtReqNo', 'txtReqNo', 'callback_Req_validate'); @@ -117,8 +115,14 @@ class purchaseorder extends BaseController $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $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')); $Req = $SelectedReq->Req; @@ -136,6 +140,7 @@ class purchaseorder extends BaseController $data['MaterialList'] = $result; + //print_r($data['MaterialList']); /* Cost code from Requisition - Client Review Fix Start here */ $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->getLastReleasedPODate(); $data['Currency']=$this->purchaseorder_model->GetCurrencytype(); + //print_r($data['Currency']); + + + // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate; + //$data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency); $ViewName = ''; if($ReqType == REVENUE) @@ -183,7 +193,6 @@ class purchaseorder extends BaseController $this->loadViews($ViewName, $this->global,$data, NULL); } } - function CreatePOPrint() { $PONO = $_GET['PONO']; diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 94d84359..5746c3a4 100644 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -52,7 +52,7 @@ function purchaseorderListing() */ function getSupplierName($supID='') { - $this->db->select('SupplierID, SupplierName,Address'); + $this->db->select('SupplierID, SupplierName,Address,PaymentTerms,PayableAT,PaymentDays'); $this->db->from('T_SupplierDetailsN'); if($supID != '') { diff --git a/application/views/importpo.php b/application/views/importpo.php index 3b9bc087..9efc1276 100644 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -74,12 +74,7 @@ if(!empty($AvlBudAmt)) 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({ minDate : m, //maxDate : 'now', @@ -1729,7 +1724,10 @@ $('#drpSupplier').change(function() { { $("#SupAddress").val(obj.Address); $("#PayableAT").val(obj.PayableAT); - $("#PaymentTerms").append( $('').val(obj.PaymentTerms).html(obj.PaymentTerms) ); + $("#PaymentTerms").val(obj.PaymentTerms); + //var a=$("PayableAT").val(); + console.log(obj.PaymentTerms); + //$("#PaymentTerms").append( $('').val(obj.PaymentTerms).html(obj.PaymentTerms) );