From 9701f5d7ad62b131999deb59a39fba700d637df9 Mon Sep 17 00:00:00 2001 From: venbatechnologies Date: Sat, 23 Jun 2018 14:35:34 +0530 Subject: [PATCH] sno remove for datesort --- .../controllers/servicepurchaseorder.php | 6 +++--- application/models/configmodel.php | 3 ++- application/models/user_model.php | 2 +- application/views/AmendPOlist.php | 12 +++++------ application/views/BatchcardHistListing.php | 7 ++++--- application/views/FinalProductlisting.php | 6 +++--- .../views/Report_monthly_gst_table.php | 5 +++++ application/views/assetListing.php | 9 ++++---- application/views/bankamountpaid.php | 11 +++++++--- application/views/configlisting.php | 21 +++++++++++++------ application/views/costListing.php | 9 ++++---- application/views/deliver_perform.php | 12 +++++++---- application/views/income_expense_list.php | 2 +- application/views/materialadjustmentlist.php | 6 +++--- application/views/ncrlist.php | 14 ++++++------- application/views/ogrlist.php | 6 +++--- .../views/statusofservicepurchaseorder.php | 16 +++++++++++++- application/views/storerequisition.php | 11 +++++----- application/views/viewIGRDetails.php | 6 +++--- index.php | 2 +- 20 files changed, 104 insertions(+), 62 deletions(-) diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index e5d5b4ec..1ba2f37d 100644 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -21,7 +21,7 @@ class servicepurchaseorder extends BaseController parent::__construct(); $this->load->model('purchaseorder_model'); - $this->load->library('session'); + $this->load->library('session'); $this->load->library('form_validation'); $this->load->model('requistion_model'); $this->isLoggedIn(); @@ -61,7 +61,7 @@ class servicepurchaseorder extends BaseController $HTML=""; for ($i = 0; $i < count($result); $i++) { - $SNo = $i + 1; + //$SNo = $i + 1; $ReqNo = $result[$i]['ReqNo']; $Reqedby = $result[$i]['FirstName']; $ReqDate = $result[$i]['ReqDate']; @@ -77,7 +77,7 @@ class servicepurchaseorder extends BaseController $HTML.=" - ".$SNo." + ". $ReqNo." ".$Reqedby." ".$ReqDate." diff --git a/application/models/configmodel.php b/application/models/configmodel.php index 62f3dfe0..e74241d0 100755 --- a/application/models/configmodel.php +++ b/application/models/configmodel.php @@ -16,7 +16,8 @@ class configmodel extends CI_Model $this->db->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate'); $this->db->from('T_ConfigMaster as Config'); // $this->db->join('t_configdetails as Con','Con.Config_ID=Config.Config_ID'); - + $this->db->order_by('Config.CreatedDate','desc'); + //$this->db->order_by('hourlyid','desc'); $query = $this->db->get(); $result = $query->result(); diff --git a/application/models/user_model.php b/application/models/user_model.php index 2d0c30a7..204c39ac 100755 --- a/application/models/user_model.php +++ b/application/models/user_model.php @@ -267,7 +267,7 @@ join ip_invoice_items on ip_invoice_items .invoice_id =ip_invoices.invoice_id } - + $sql .= "ORDER BY ip_invoices.invoice_date_created DESC"; $query = $this->db->query($sql); return $query->result(); } diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php index e2486dc0..667b87c0 100755 --- a/application/views/AmendPOlist.php +++ b/application/views/AmendPOlist.php @@ -22,7 +22,7 @@ - + @@ -44,7 +44,7 @@ $index = $index + 1; ?> - + + + + + @@ -195,12 +199,13 @@ if(!empty($amountpaid)) + + + + + - + diff --git a/application/views/deliver_perform.php b/application/views/deliver_perform.php index ec784bb5..3024aabb 100644 --- a/application/views/deliver_perform.php +++ b/application/views/deliver_perform.php @@ -132,7 +132,7 @@ - + @@ -155,7 +155,7 @@ ?> - +
# PONO# PO Type PO Date
PONO ?> ReqType ?> PODate); @@ -104,18 +104,18 @@ - + diff --git a/application/views/BatchcardHistListing.php b/application/views/BatchcardHistListing.php index 5b47abc0..532d2631 100755 --- a/application/views/BatchcardHistListing.php +++ b/application/views/BatchcardHistListing.php @@ -68,18 +68,19 @@ + + + - + diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index 5f7c3d2f..aadc2907 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -154,7 +154,11 @@ if(!empty($amountpaid)) - Podate?>Podate); + $Podate = $dt->format('d-m-Y'); echo $Podate ?> PONO?>
S.No OrderedDate DispatchDate CustomerName
invoice_date_created)); echo $itemdate; @@ -254,19 +254,23 @@ + + - + + + - + diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php index dea5c514..19f3b91c 100755 --- a/application/views/viewIGRDetails.php +++ b/application/views/viewIGRDetails.php @@ -27,7 +27,7 @@ - + @@ -50,7 +50,7 @@ $index = $index +1; ?> - + @@ -245,7 +245,7 @@ "lengthChange": true, "searching": true, "ordering": true, - "aaSorting": [[ 5, "desc" ]], + "aaSorting": [[ 4, "desc" ]], "info": true, "autoWidth": true diff --git a/index.php b/index.php index 8a7c0119..2b208808 100755 --- a/index.php +++ b/index.php @@ -18,7 +18,7 @@ * NOTE: If you change these, also change the error_reporting() code below * */ - define('ENVIRONMENT', 'testing'); + define('ENVIRONMENT', 'development'); /* *--------------------------------------------------------------- * ERROR REPORTING
S.No IGR No PO No Supplier Name
IGRNO ?> PONO ?> SupplierName ?>