diff --git a/app/Http/routes.php b/app/Http/routes.php
index bb9950b8a547..cb055e408ee6 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -352,7 +352,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
 define('NINJA_GATEWAY_CONFIG', '');
 define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
 define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-define('NINJA_VERSION', '2.0.1');
+define('NINJA_VERSION', '2.1.0');
 define('NINJA_DATE', '2000-01-01');
 define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
 define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 63c208de7399..4e536e90ce1e 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -159,7 +159,7 @@ class InvoiceRepository
                 }
 
                 if ($entityType == ENTITY_INVOICE) {
-                    if ($model->invoice_status_id < INVOICE_STATUS_PAID) {
+                    if ($model->balance > 0) {
                         $str .= '<li><a href="'.\URL::to('payments/create/'.$model->client_public_id.'/'.$model->public_id).'">'.trans('texts.enter_payment').'</a></li>';
                     }
 
diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php
index f7fce4f34641..fc1016d19e41 100644
--- a/resources/lang/da/texts.php
+++ b/resources/lang/da/texts.php
@@ -626,5 +626,51 @@ return array(
   'zapier' => 'Zapier <sup>Beta</sup>',
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
+
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
     
 );
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index cc1feb647bee..8f9c585f3919 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -618,5 +618,51 @@ return array(
   'recurring' => 'Wiederkehrend',
   'last_invoice_sent' => 'Letzte Rechnung verschickt am :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
 
 );
\ No newline at end of file
diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php
index 78b9824dae0c..f414e2ca6675 100644
--- a/resources/lang/es/texts.php
+++ b/resources/lang/es/texts.php
@@ -597,6 +597,51 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
 
 
 );
\ No newline at end of file
diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php
index 940405863b91..02671406fe53 100644
--- a/resources/lang/es_ES/texts.php
+++ b/resources/lang/es_ES/texts.php
@@ -626,5 +626,51 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
 
 );
\ No newline at end of file
diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index bf6a3ec9844d..e0d05261662d 100644
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@@ -618,5 +618,51 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
 
 );
\ No newline at end of file
diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php
index 25d639b094c1..7fc837eaa1a8 100644
--- a/resources/lang/fr_CA/texts.php
+++ b/resources/lang/fr_CA/texts.php
@@ -618,4 +618,50 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
 );
diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php
index 9aa1eeccc889..46ecca486de8 100644
--- a/resources/lang/it/texts.php
+++ b/resources/lang/it/texts.php
@@ -619,5 +619,51 @@ return array(
   'zapier' => 'Zapier <sup>Beta</sup>',
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
+
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
     
 );
diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php
index d7a3c0c1b6b3..84a499601294 100644
--- a/resources/lang/lt/texts.php
+++ b/resources/lang/lt/texts.php
@@ -628,6 +628,52 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
     
 );
 
diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php
index eebd6786da34..600da592690f 100644
--- a/resources/lang/nb_NO/texts.php
+++ b/resources/lang/nb_NO/texts.php
@@ -625,5 +625,52 @@ return array(
   'zapier' => 'Zapier <sup>Beta</sup>',
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
+
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
   
 );
\ No newline at end of file
diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php
index 2f13f16b650c..f996268604d9 100644
--- a/resources/lang/nl/texts.php
+++ b/resources/lang/nl/texts.php
@@ -621,5 +621,51 @@ return array(
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
 
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
+
   
 );
diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php
index a0cd85444caf..65298bd95b7e 100644
--- a/resources/lang/pt_BR/texts.php
+++ b/resources/lang/pt_BR/texts.php
@@ -620,6 +620,52 @@ return array(
   'zapier' => 'Zapier <sup>Beta</sup>',
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
+
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
     
   
 );
diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php
index 86f9d50577dc..dd202b755a70 100644
--- a/resources/lang/sv/texts.php
+++ b/resources/lang/sv/texts.php
@@ -623,6 +623,52 @@ return array(
   'zapier' => 'Zapier <sup>Beta</sup>',
   'recurring' => 'Recurring',
   'last_invoice_sent' => 'Last invoice sent :date',
+
+  'processed_updates' => 'Successfully completed update',
+  'tasks' => 'Tasks',
+  'new_task' => 'New Task',
+  'start_time' => 'Start Time',
+  'created_task' => 'Successfully created task',
+  'updated_task' => 'Successfully updated task',
+  'edit_task' => 'Edit Task',
+  'archive_task' => 'Archive Task',
+  'restore_task' => 'Restore Task',
+  'delete_task' => 'Delete Task',
+  'stop_task' => 'Stop Task',
+  'time' => 'Time',
+  'start' => 'Start',
+  'stop' => 'Stop',
+  'now' => 'Now',
+  'timer' => 'Timer',
+  'manual' => 'Manual',
+  'date_and_time' => 'Date & Time',
+  'second' => 'second',
+  'seconds' => 'seconds',
+  'minute' => 'minute',
+  'minutes' => 'minutes',
+  'hour' => 'hour',
+  'hours' => 'hours',
+  'task_details' => 'Task Details',
+  'duration' => 'Duration',
+  'end_time' => 'End Time',
+  'end' => 'End',
+  'invoiced' => 'Invoiced',
+  'logged' => 'Logged',
+  'running' => 'Running',
+  'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
+  'task_error_running' => 'Please stop running tasks first',
+  'task_error_invoiced' => 'Tasks have already been invoiced',
+  'restored_task' => 'Successfully restored task',
+  'archived_task' => 'Successfully archived task',
+  'archived_tasks' => 'Successfully archived :count tasks',
+  'deleted_task' => 'Successfully deleted task',
+  'deleted_tasks' => 'Successfully deleted :count tasks',
+  'create_task' => 'Create Task',
+  'stopped_task' => 'Successfully stopped task',
+  'invoice_task' => 'Invoice Task',
+  'invoice_labels' => 'Invoice Labels',
+  'prefix' => 'Prefix',
+  'counter' => 'Counter',
   
   
 );
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 041001652d83..1781087b1d8a 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -375,7 +375,7 @@
 			 {!! Button::normal(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'email_button', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!}
             @endif
 
-			@if ($invoice && $invoice->id && $entityType == ENTITY_INVOICE && !$invoice->is_recurring && !$invoice->isPaid())
+			@if ($invoice && $invoice->id && $entityType == ENTITY_INVOICE && !$invoice->is_recurring && $invoice->balance > 0)
 				{!! Button::primary(trans('texts.enter_payment'))->withAttributes(array('onclick' => 'onPaymentClick()'))->appendIcon(Icon::create('usd')) !!}		
 			@endif
 		@elseif ($invoice && $invoice->trashed() && !$invoice->is_deleted == '1')