diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 7bdc563a..fbeb4750 100644 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -335,16 +335,6 @@ function purchaseorderListing() return $query->result(); } - - - function getLastReleasedPODate() - { - $this->db->select('max(ReleasedOn) as PODate'); - $this->db->from('T_PurchaseOrder_Master'); - $query = $this->db->get(); - - return $query->result(); - } /** @@ -357,7 +347,7 @@ function purchaseorderListing() $this->db->insert('T_PurchaseOrder_Master', $POMaster); $insert_id = $this->db->affected_rows(); $this->db->trans_complete(); - //print_r($this->db->last_query()); + // print_r($this->db->last_query()); if($insert_id>0) { $subQuery = 'select max(PONO) as PONO from T_PurchaseOrder_Master'; @@ -445,7 +435,7 @@ function purchaseorderListing() function GetServicePurchaseOrder($PONO = '') { $this->db->distinct(); - $this->db->select('ReqNo,POMast.PONO,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,Stat.StatusCode,POMast.ExchangeRateCalculatedon,POMast.ExchangeRate,POMast.CurrencyType'); + $this->db->select('ReqNo,POMast.PONO,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,Stat.StatusCode'); $this->db->from('T_PurchaseOrder_Master POMast'); $this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID'); $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status'); @@ -483,7 +473,7 @@ function purchaseorderListing() $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,ROUND((ServiceTax + EducessTax + SecHigherEducessTax + KrishiKalyantax + SwachhBharattax),2)as Taxamount - ,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode ,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription FROM T_PurchaseOrder_LineItem LineItem + ,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode ,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO @@ -565,7 +555,7 @@ function GetImportPurchaseOrderDetailsForPDF($PONO = '') function GetCurrencyDetail($Currency='') { - $subQuery='SELECT Currency_Code,Country_and_Currency from T_Currency_Details where Currency_Code=?'; + $subQuery='SELECT * from T_Currency_Details where CurrencyCode=?'; $query=$this->db->query($subQuery,array($Currency)); return $query->result(); @@ -602,7 +592,7 @@ Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue , function GetCurrencytype() { - $subQuery = 'select Currency_Code,Country_and_Currency from T_Currency_Details;'; + $subQuery = 'select * from T_Currency_Details'; $query = $this->db->query($subQuery); diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index aa5babbb..f65df8d7 100644 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -102,7 +102,11 @@ $("#PODate").datepicker({ minDate : 'now', dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); - + $("#Requeston").datepicker({ + //minDate : d, + maxDate : 'now', + dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' +}); $('#drpSupplier').change(function() { var id = $('#drpSupplier').val(); @@ -591,797 +595,884 @@ $(document).ready(function () { echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
-
-
-
-

Siddharth Industries - Edit Service Purchase Order -

-
- -
-
-
-
- - - - 'Selected Requisition Numbers'); - if(!empty($ReqList)) - { - foreach ($ReqList as $SID): - - $options[$SID->ReqNo] = $SID->ReqNo ; - endforeach; - } - echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"'); - - ?> -
-
- -
- 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
- -
-
-
-
- - 'Select Supplier'); - //print_r( $options); - - if(!empty($Suplist)) - { - foreach ($Suplist as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - - endforeach; - } - - echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); - - ?> - -
-

- -
- 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
-
-
- -
- - 'POType','value' => set_value('POType',SERVICE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> - -
-
-
-
-
- Select Delivery By
- - - 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - - - - -
-

- -
- 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
- -
- -
-
-
- -
- -
-
- - - - - -
+ + +