diff --git a/application/controllers/sales.php b/application/controllers/sales.php
index 95fd46b72..bfacee73c 100644
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -24,7 +24,7 @@ class Sales extends Secure_area
 		$sales = $this->Sale->get_all($payment_type,$lines_per_page,$limit_from);
 		$total_rows = $this->Sale->get_found_rows($payment_type);
 		$data['payment_type'] = $payment_type;
-		$data['links'] = $this->_initialize_pagination($payment_type, $lines_per_page, $limit_from, $total_rows);
+		$data['links'] = $this->_initialize_pagination($this->Sale, $lines_per_page, $limit_from, -1, $payment_type);
 	
 		$data['manage_table']=get_sales_manage_table($sales,$this);
 		$this->load->view($data['controller_name'] . '/manage',$data);
@@ -39,23 +39,6 @@ class Sales extends Secure_area
 		echo $data_row;
 	}
 	
-	function _initialize_pagination($payment_type, $lines_per_page, $limit_from = 0, $total_rows = 0)
-	{
-		$this->load->library('pagination');
-		$config['base_url'] = site_url($this->get_controller_name() . '/manage/' . $payment_type);
-		$config['total_rows'] = $total_rows;
-		$config['per_page'] = $lines_per_page;
-		$config['num_links'] = 2;
-		$config['last_link'] = $this->lang->line('common_last_page');
-		$config['first_link'] = $this->lang->line('common_first_page');
-		// page is calculated here instead of in pagination lib
-		$config['cur_page'] = $limit_from > 0  ? $limit_from : 0;
-		$config['page_query_string'] = FALSE;
-		$config['uri_segment'] = 0;
-		$this->pagination->initialize($config);
-		return $this->pagination->create_links();
-	}
-	
 	/**
 	 *
 	 * Get the width for the add/edit form.
@@ -74,7 +57,7 @@ class Sales extends Secure_area
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
 		$sales = $this->Sale->search($search, $payment_type, $lines_per_page, $limit_from, $search);
 		$total_rows = $this->Sale->get_found_rows($search);
-		$links = $this->_initialize_pagination($payment_type, $lines_per_page, $limit_from, $total_rows);
+		$links = $this->_initialize_pagination($this->Sale,$lines_per_page,$limit_from,$total_rows,$payment_type);
 		$data_rows=get_sales_manage_table_data_rows($sales,$this);
 		echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
 		$this->_remove_duplicate_cookies();
@@ -82,8 +65,12 @@ class Sales extends Secure_area
 
 	function item_search()
 	{
-		$suggestions = $this->Item->get_item_search_suggestions($this->input->post('q'),$this->input->post('limit'));
-		$suggestions = array_merge($suggestions, $this->Item_kit->get_item_kit_search_suggestions($this->input->post('q'),$this->input->post('limit')));
+		if ($this->sale_lib->get_mode() == 'return') {
+			$suggestions = $this->Sale->get_search_suggestions($this->input->post('q'), $this->input->post('limit'));
+		} else {
+			$suggestions = $this->Item->get_item_search_suggestions($this->input->post('q'),$this->input->post('limit'));
+			$suggestions = array_merge($suggestions, $this->Item_kit->get_item_kit_search_suggestions($this->input->post('q'),$this->input->post('limit')));
+		}
 		echo implode("\n",$suggestions);
 	}
 
@@ -760,5 +747,6 @@ class Sales extends Secure_area
 		$exists=!empty($invoice_number) && $this->Sale->invoice_number_exists($invoice_number,$sale_id);
 		echo json_encode(array('success'=>!$exists,'message'=>$this->lang->line('sales_invoice_number_duplicate')));
 	}
+	
 }
 ?>
diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php
index b0fddb643..17aac86d5 100644
--- a/application/language/en/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php
index d99564a47..7b56d7c20 100644
--- a/application/language/es/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/fr/sales_lang.php b/application/language/fr/sales_lang.php
index c8594da48..88063319e 100644
--- a/application/language/fr/sales_lang.php
+++ b/application/language/fr/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php
index d9b76e157..28f703ccc 100644
--- a/application/language/id/sales_lang.php
+++ b/application/language/id/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php
index 839947f2d..29412d24f 100755
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overzicht";
 $lang["sales_update"] = "Bewerk Ticket";
 $lang["sales_confirm_delete"] = "Bent u zeker dat u de geselecteerde aankopen wil verwijderen?";
 $lang["sales_no_description"] = "Geen";
+$lang["sales_invoice_update"] = "Hernummer";
diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php
index ac04037f3..cf1dc2f5c 100644
--- a/application/language/ru/sales_lang.php
+++ b/application/language/ru/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/th/sales_lang.php b/application/language/th/sales_lang.php
index 3f0215489..c7864dda4 100644
--- a/application/language/th/sales_lang.php
+++ b/application/language/th/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/tr/sales_lang.php b/application/language/tr/sales_lang.php
index ed4bccaf7..9c418327b 100644
--- a/application/language/tr/sales_lang.php
+++ b/application/language/tr/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php
index 35bd948ab..ef8acd7b0 100755
--- a/application/language/zh/sales_lang.php
+++ b/application/language/zh/sales_lang.php
@@ -109,3 +109,4 @@ $lang["sales_overview"] = "Overview";
 $lang["sales_update"] = "Edit Sale";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_no_description"] = "None";
+$lang["sales_invoice_update"] = "Recount";
diff --git a/application/models/sale.php b/application/models/sale.php
index bccc2d606..ebf723ab6 100644
--- a/application/models/sale.php
+++ b/application/models/sale.php
@@ -83,6 +83,12 @@ class Sale extends CI_Model
 		return $this->db->get();
 	}
 	
+	function get_total_rows()
+	{
+		$this->db->from('sales');
+		return $this->db->count_all_results();
+	}
+	
 	function get_search_suggestions($search,$limit=25)
 	{
 		$suggestions = array();
diff --git a/translations/sales_lang.csv b/translations/sales_lang.csv
index eae88f9da..bc6ec0f4d 100644
--- a/translations/sales_lang.csv
+++ b/translations/sales_lang.csv
@@ -108,3 +108,4 @@ sales_overview,Overzicht,Overview,Overview,Overview,Overview,Overview,Overview,O
 sales_update,Bewerk Ticket,Edit Sale,Edit Sale,Edit Sale,Edit Sale,Edit Sale,Edit Sale,Edit Sale,Edit Sale
 sales_confirm_delete,Bent u zeker dat u de geselecteerde aankopen wil verwijderen?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?,Are you sure you want to delete the selected sales?
 sales_no_description,Geen,None,None,None,None,None,None,None,None
+sales_invoice_update,Hernummer,Recount,Recount,Recount,Recount,Recount,Recount,Recount,Recount