diff --git a/application/controllers/items.php b/application/controllers/items.php
index b3be01d8e..e6eb9d6af 100644
--- a/application/controllers/items.php
+++ b/application/controllers/items.php
@@ -11,14 +11,15 @@ class Items extends Secure_area implements iData_controller
 	
 	function index($limit_from=0)
 	{
+		$stock_location=$this->item_lib->get_item_location();
+		$stock_locations=$this->Stock_locations->get_allowed_locations();
+		
 		$data['controller_name']=$this->get_controller_name();
 		$data['form_width']=$this->get_form_width();
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$items = $this->Item->get_all($lines_per_page,$limit_from);
+		$items = $this->Item->get_all($stock_location,$lines_per_page,$limit_from);
 		$data['links'] = $this->_initialize_pagination($this->Item,$lines_per_page,$limit_from);
 		
-		$stock_location=$this->item_lib->get_item_location();
-		$stock_locations=$this->Stock_locations->get_allowed_locations();
 		$data['stock_location']=$stock_location;
 		$data['stock_locations']=$stock_locations;
 		$data['manage_table']=get_items_manage_table( $this->Item->get_all( $stock_location, $lines_per_page, $limit_from), $this );
diff --git a/application/controllers/suppliers.php b/application/controllers/suppliers.php
index 66d29ee19..e6022104e 100644
--- a/application/controllers/suppliers.php
+++ b/application/controllers/suppliers.php
@@ -13,7 +13,9 @@ class Suppliers extends Person_controller
 		$data['form_width']=$this->get_form_width();
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
 		$suppliers = $this->Supplier->get_all($lines_per_page);
-		$data['links'] = $this->_initialize_pagination($this->Supplier,$lines_per_page);
+		$total_rows = $this->Supplier->get_found_rows($payment_type);
+		
+		$data['links'] = $this->_initialize_pagination($this->Supplier,$lines_per_page,$total_rows);
 		$data['manage_table']=get_supplier_manage_table($suppliers,$this);
 		$this->load->view('suppliers/manage',$data);
 	}
diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php
index 9cb720418..3affb78cf 100644
--- a/application/language/en/common_lang.php
+++ b/application/language/en/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "F";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php
index f0c2e8587..88047f4b2 100644
--- a/application/language/es/common_lang.php
+++ b/application/language/es/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "F";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php
index c791a5b49..25d731d99 100644
--- a/application/language/fr/common_lang.php
+++ b/application/language/fr/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "F";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
index f039403cd..6dcdfc562 100644
--- a/application/language/id/common_lang.php
+++ b/application/language/id/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php
index e447e7cce..93f95c284 100755
--- a/application/language/nl-BE/common_lang.php
+++ b/application/language/nl-BE/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Datum";
 $lang["common_search_options"] = "Zoek criteria";
+$lang["common_first_page"] = "Eerste";
+$lang["common_last_page"] = "Laatste";
diff --git a/application/language/ru/common_lang.php b/application/language/ru/common_lang.php
index 489bfe239..09b7fa132 100644
--- a/application/language/ru/common_lang.php
+++ b/application/language/ru/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/th/common_lang.php b/application/language/th/common_lang.php
index f9be337c0..00c665e30 100644
--- a/application/language/th/common_lang.php
+++ b/application/language/th/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/tr/common_lang.php b/application/language/tr/common_lang.php
index f1cd67a61..9c01879d0 100644
--- a/application/language/tr/common_lang.php
+++ b/application/language/tr/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php
index e30666405..a66db4226 100755
--- a/application/language/zh/common_lang.php
+++ b/application/language/zh/common_lang.php
@@ -45,3 +45,5 @@ $lang["common_gender_male"] = "M";
 $lang["common_gender_female"] = "V";
 $lang["common_date"] = "Date";
 $lang["common_search_options"] = "Search options";
+$lang["common_first_page"] = "First";
+$lang["common_last_page"] = "Last";
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index aac406393..d90799b94 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -134,13 +134,13 @@ function show_hide_search_filter(search_filter_section, switchImgTag) {
 	</div>
 </div>
 
+<div id="pagination"><?= $links ?></div>
 <div id="titleTextImg" style="background-color:#EEEEEE;height:30px;position:relative;">
 	<div style="float:left;vertical-align:text-top;"><?php echo $this->lang->line('common_search_options'); ?> :</div>
 	<a id="imageDivLink" href="javascript:show_hide_search_filter('search_filter_section', 'imageDivLink');" style="outline:none;">
 	<img src="
 	<?php echo isset($search_section_state)?  ( ($search_section_state)? base_url().'images/minus.png' : base_url().'images/plus.png') : base_url().'images/plus.png';?>" style="border:0;outline:none;padding:0px;margin:0px;position:relative;top:-5px;"></a>
 </div>
-
 <?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
 <div id="search_filter_section" style="display: <?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>;background-color:#EEEEEE;">
 	<?php echo form_label($this->lang->line('items_low_inventory_items').' '.':', 'low_inventory');?>
@@ -155,7 +155,6 @@ function show_hide_search_filter(search_filter_section, switchImgTag) {
 	<?php echo form_checkbox(array('name'=>'is_deleted','id'=>'is_deleted','value'=>1,'checked'=> isset($is_deleted)?  ( ($is_deleted)? 1 : 0) : 0));// Parq 131215?>  
 	<input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
 </div>
-<div id="pagination"><?= $links ?></div>
 <div id="table_action_header">
 	<ul>
 		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
diff --git a/translations/common_lang.csv b/translations/common_lang.csv
index ef2b3cc51..3e052b845 100644
--- a/translations/common_lang.csv
+++ b/translations/common_lang.csv
@@ -44,3 +44,5 @@ common_gender_male,M,M,M,M,M,M,M,M,M
 common_gender_female,V,F,F,F,V,V,V,V,V
 common_date,Datum,Date,Date,Date,Date,Date,Date,Date,Date
 common_search_options,Zoek criteria,Search options,Search options,Search options,Search options,Search options,Search options,Search options,Search options
+common_first_page,Eerste,First,First,First,First,First,First,First,First
+common_last_page,Laatste,Last,Last,Last,Last,Last,Last,Last,Last
diff --git a/translations/items_lang.csv b/translations/items_lang.csv
index 04920519c..3ccbac19a 100644
--- a/translations/items_lang.csv
+++ b/translations/items_lang.csv
@@ -38,7 +38,7 @@ items_item,Product,Artículo,Item,Item,產品,Товар,สินค้า,Ür
 items_item_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,โค๊ด,UPC/EAN/ISBN,Kode Barang
 items_number_required,UPC/EAN/ISBN moet ingevuld worden,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field,UPC/EAN/ISBN is a required field
 items_location,Locatie,Ubicación,Location,Location,位置,место,ที่ตั้ง,Yer,Lokasi Barang
-items_low_inventory_items,Producten niet in stock,Artículos de Inventario Escaso,,Items à Stock Faible,低庫存產品,Низкий инвентаризации товары,,,Daftar Stock Rendah
+items_low_inventory_items,Producten niet in stock,Artículos de Inventario Escaso,Low Inventory Items,Items à Stock Faible,低庫存產品,Низкий инвентаризации товары,,,Daftar Stock Rendah
 items_manually_editing_of_quantity,Manuele aanpassing hoeveelheid,Edición Manual de Cantidad,Manual Edit of Quantity,Édition Manuelle de Quantité,手動編輯數量,Руководство Изменить количество,แก้ไขจำนวน,Elle adet düzeltme,Perubahan jumlah Stok secara manual
 items_must_select_item_for_barcode,U moet ten minste 1 product selecteren om een barcode te genereren,Debes seleccionar al menos 1 artículo para generar códigos de barras,You must select at least 1 item to generate barcodes,Vous devez sélectionner au moins un item,您必須至少選擇一個產品生才能產生條碼,Вы должны выбрать хотя бы 1 товар для создания штрих-кодов,คุต้องเลือกสินค้าอย่างน้อยหนึ่งอย่างเพื่อจะสร้างบาร์โค๊ด,Barkod üretmek için en az bir ürün seçmelisiniz,Anda harus memilih minimal 1 item untuk membuat barcode
 items_name,Productnaam,Nombre del Artículo,Item Name,Nom,產品名稱,название товара,ชื่อสินค้า,Ürün Adı,Nama Barang