From 4e071c9fbbf7fe2800ec16970c0195817e205e15 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Wed, 22 Oct 2014 07:00:43 +0200 Subject: [PATCH] Fix blank page when returning receivings Conflicts: application/libraries/Receiving_lib.php --- application/language/en/receivings_lang.php | 1 + application/libraries/Receiving_lib.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php index 11e1ab094..24edd1cdc 100644 --- a/application/language/en/receivings_lang.php +++ b/application/language/en/receivings_lang.php @@ -54,4 +54,5 @@ $lang['recvs_employee']='Employee'; $lang['recvs_receipt']='Receivings Receipt'; $lang['recvs_date_required']='A correct date needs to be filled in'; $lang['recvs_date_type']='Date field is required'; +$lang['recvs_delete_confirmation'] = 'Are you sure you want to delete this receiving, this action cannot be undone'; ?> diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php index 1c6ae362c..3edb03922 100644 --- a/application/libraries/Receiving_lib.php +++ b/application/libraries/Receiving_lib.php @@ -34,7 +34,7 @@ class Receiving_lib { $this->CI->session->set_userdata('supplier',$supplier_id); } - + function get_mode() { if(!$this->CI->session->userdata('recv_mode')) @@ -326,8 +326,8 @@ class Receiving_lib { $this->CI->session->unset_userdata('supplier'); } - - function clear_mode() + + function clear_mode() { $this->CI->session->unset_userdata('receiving_mode'); } @@ -360,4 +360,4 @@ class Receiving_lib return $total; } } -?> \ No newline at end of file +?>