diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php index b3e14d57a..3df05c9f8 100644 --- a/application/controllers/Customers.php +++ b/application/controllers/Customers.php @@ -24,7 +24,7 @@ class Customers extends Person_controller $limit = $this->input->get('limit'); $offset = $this->input->get('offset'); - $customers = $this->Customer->search($search, $offset, $limit); + $customers = $this->Customer->search($search, $limit, $offset); $total_rows = $this->Customer->get_found_rows($search); $data_rows = array(); diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 950799ed7..2a47a3e2d 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -19,6 +19,7 @@ function get_sales_manage_table_headers() if($CI->config->item('invoice_enable') == TRUE) { $headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number')); + $headers[] = array('invoice' => ' '); } return transform_headers(array_merge($headers, array(array( 'receipt' => ' ' )))); diff --git a/application/views/customers/form_excel_import.php b/application/views/customers/form_excel_import.php index 27be828df..54e22fd12 100644 --- a/application/views/customers/form_excel_import.php +++ b/application/views/customers/form_excel_import.php @@ -31,7 +31,7 @@ $(document).ready(function() success:function(response) { dialog_support.hide(); - table_support.handle_submit('customers', response); + table_support.handle_submit('', response); }, dataType:'json' }); diff --git a/application/views/items/form_excel_import.php b/application/views/items/form_excel_import.php index 10e89a10a..589946fa1 100644 --- a/application/views/items/form_excel_import.php +++ b/application/views/items/form_excel_import.php @@ -31,7 +31,7 @@ $(document).ready(function() success:function(response) { dialog_support.hide(); - table_support.handle_submit(response); + table_support.handle_submit('', response); }, dataType:'json' }); diff --git a/application/views/partial/bootstrap_tables_locale.php b/application/views/partial/bootstrap_tables_locale.php index 7ee74e8d1..a1db9b873 100644 --- a/application/views/partial/bootstrap_tables_locale.php +++ b/application/views/partial/bootstrap_tables_locale.php @@ -15,7 +15,8 @@ return 'lang->line('common_search'); ?>'; }, formatNoMatches: function () { - return 'lang->line($controller_name . '_no_' . $controller_name .'_to_display'); ?>'; + return 'lang->line(preg_match('(customers|suppliers|employees)', $controller_name) ? + 'common_no_persons_to_display' : $controller_name . '_no_' . $controller_name .'_to_display'); ?>'; }, formatPaginationSwitch: function () { return 'lang->line('tables_hide_show_pagination'); ?>';