From 3981d59ef37203f82ff5872f6b093817a9e2b4d3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 21 Jul 2024 11:12:07 +1000
Subject: [PATCH 1/7] Fixes for translations

---
 .../PayPal/PayPalBasePaymentDriver.php        |  1 +
 .../PayPalPPCPPaymentDriver.php               | 79 +++++++++++--------
 .../PayPalRestPaymentDriver.php               |  7 +-
 app/Services/Client/PaymentMethod.php         |  2 +-
 lang/en/texts.php                             |  2 +-
 .../ninja2020/gateways/paypal/pay.blade.php   | 33 ++++----
 .../gateways/paypal/ppcp/pay.blade.php        |  9 ++-
 7 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/app/PaymentDrivers/PayPal/PayPalBasePaymentDriver.php b/app/PaymentDrivers/PayPal/PayPalBasePaymentDriver.php
index ec637548d3..56824c8402 100644
--- a/app/PaymentDrivers/PayPal/PayPalBasePaymentDriver.php
+++ b/app/PaymentDrivers/PayPal/PayPalBasePaymentDriver.php
@@ -525,6 +525,7 @@ class PayPalBasePaymentDriver extends BaseDriver
         $this->init();
 
         PayPalWebhook::dispatch($request->all(), $request->headers->all(), $this->access_token);
+        
     }
 
     public function createNinjaPayment($request, $response)
diff --git a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
index 14fd0ace2d..4cb22ad728 100644
--- a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
@@ -306,7 +306,6 @@ class PayPalPPCPPaymentDriver extends PayPalBasePaymentDriver
      *
      * @param  mixed $request
      * @param  array $response
-     * @return void
      */
     public function processTokenPayment($request, array $response)
     {
@@ -362,26 +361,32 @@ class PayPalPPCPPaymentDriver extends PayPalBasePaymentDriver
         }
 
         $response = $r->json();
+        
+        if(isset($response['purchase_units'][0]['payments']['captures'][0]['status']) && $response['purchase_units'][0]['payments']['captures'][0]['status'] == 'COMPLETED')
+        {
 
-        $data = [
-            'payment_type' => $this->getPaymentMethod($request->gateway_type_id),
-            'amount' => $response['purchase_units'][0]['payments']['captures'][0]['amount']['value'],
-            'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
-            'gateway_type_id' => $this->gateway_type_id,
-        ];
+            $data = [
+                'payment_type' => $this->getPaymentMethod($request->gateway_type_id),
+                'amount' => $response['purchase_units'][0]['payments']['captures'][0]['amount']['value'],
+                'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
+                'gateway_type_id' => $this->gateway_type_id,
+            ];
 
-        $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
+            $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
 
-        SystemLogger::dispatch(
-            ['response' => $response, 'data' => $data],
-            SystemLog::CATEGORY_GATEWAY_RESPONSE,
-            SystemLog::EVENT_GATEWAY_SUCCESS,
-            SystemLog::TYPE_PAYPAL_PPCP,
-            $this->client,
-            $this->client->company,
-        );
+            SystemLogger::dispatch(
+                ['response' => $response, 'data' => $data],
+                SystemLog::CATEGORY_GATEWAY_RESPONSE,
+                SystemLog::EVENT_GATEWAY_SUCCESS,
+                SystemLog::TYPE_PAYPAL_PPCP,
+                $this->client,
+                $this->client->company,
+            );
 
-        return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
+            return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
+        }
+
+        return response()->json(['message' => 'Error processing token payment'], 400);
 
     }
 
@@ -431,26 +436,36 @@ class PayPalPPCPPaymentDriver extends PayPalBasePaymentDriver
         }
 
         $response = $r->json();
+        if(isset($response['purchase_units'][0]['payments']['captures'][0]['status']) && $response['purchase_units'][0]['payments']['captures'][0]['status'] == 'COMPLETED')
+        {
 
-        $data = [
-            'payment_type' => $this->getPaymentMethod((string)$cgt->gateway_type_id),
-            'amount' => $response['purchase_units'][0]['payments']['captures'][0]['amount']['value'],
-            'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
-            'gateway_type_id' => $this->gateway_type_id,
-        ];
+            $data = [
+                'payment_type' => $this->getPaymentMethod((string)$cgt->gateway_type_id),
+                'amount' => $response['purchase_units'][0]['payments']['captures'][0]['amount']['value'],
+                'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
+                'gateway_type_id' => $this->gateway_type_id,
+            ];
 
-        $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
+            $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
 
-        SystemLogger::dispatch(
-            ['response' => $response, 'data' => $data],
-            SystemLog::CATEGORY_GATEWAY_RESPONSE,
-            SystemLog::EVENT_GATEWAY_SUCCESS,
-            SystemLog::TYPE_PAYPAL_PPCP,
-            $this->client,
-            $this->client->company,
-        );
+            SystemLogger::dispatch(
+                ['response' => $response, 'data' => $data],
+                SystemLog::CATEGORY_GATEWAY_RESPONSE,
+                SystemLog::EVENT_GATEWAY_SUCCESS,
+                SystemLog::TYPE_PAYPAL_PPCP,
+                $this->client,
+                $this->client->company,
+            );
 
+        }
+
+        $this->processInternallyFailedPayment($this, new \Exception('Auto billing failed.', 400));
+
+        SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYPAL, $this->client, $this->client->company);
 
     }
 
+
+
+
 }
diff --git a/app/PaymentDrivers/PayPalRestPaymentDriver.php b/app/PaymentDrivers/PayPalRestPaymentDriver.php
index 524b59f8c6..ba1cbc62e7 100644
--- a/app/PaymentDrivers/PayPalRestPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalRestPaymentDriver.php
@@ -340,9 +340,7 @@ class PayPalRestPaymentDriver extends PayPalBasePaymentDriver
 
         }
 
-
-
-        
+        return response()->json(['message' => 'Error processing token payment'], 400);
 
     }
 
@@ -413,11 +411,12 @@ class PayPalRestPaymentDriver extends PayPalBasePaymentDriver
                 $this->client,
                 $this->client->company,
             );
+
         }
 
         $this->processInternallyFailedPayment($this, new \Exception('Auto billing failed.', 400));
 
-        SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYPAL, $this->client, $this->client->company);
+        SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYPAL, $this->client, $this->client->company);
 
     }
 }
diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php
index 8a27f31831..de5e162258 100644
--- a/app/Services/Client/PaymentMethod.php
+++ b/app/Services/Client/PaymentMethod.php
@@ -169,7 +169,7 @@ class PaymentMethod
                 if (isset($gateway->fees_and_limits) && is_object($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, GatewayType::CREDIT_CARD)) { //@phpstan-ignore-line
                     if ($this->validGatewayForAmount($gateway->fees_and_limits->{GatewayType::CREDIT_CARD}, $this->amount)) {
                         // $this->payment_methods[] = [$gateway->id => $type];
-                        //@15-06-2024
+                        // @15-06-2024
                         $this->buildUrl($gateway, $type);
                     }
                 } else {
diff --git a/lang/en/texts.php b/lang/en/texts.php
index fbfdef2e61..e2bad2efda 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5238,7 +5238,7 @@ $lang = array(
     'local_domain_help' => 'EHLO domain (optional)',
     'port_help' => 'ie. 25,587,465',
     'host_help' => 'ie. smtp.gmail.com',
-    'always_show_required_fields' => 'Allows show required fields form',
+    'always_show_required_fields' => 'Always show required fields form',
     'always_show_required_fields_help' => 'Displays the required fields form always at checkout',
     'advanced_cards' => 'Advanced Cards',
     'activity_140' => 'Statement sent to :client',
diff --git a/resources/views/portal/ninja2020/gateways/paypal/pay.blade.php b/resources/views/portal/ninja2020/gateways/paypal/pay.blade.php
index 29137b17a4..b11b968a7f 100644
--- a/resources/views/portal/ninja2020/gateways/paypal/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paypal/pay.blade.php
@@ -30,16 +30,6 @@
 
 @push('footer')
 
-<script type="application/json" fncls="fnparams-dede7cc5-15fd-4c75-a9f4-36c430ee3a99">
-    {
-        "f":"{{ $guid }}",
-        "s":"paypal.pay"        // unique ID for each web page
-    }
-</script>
-
-<script type="text/javascript" src="https://c.paypal.com/da/r/fb.js"></script>
-
-
 <style type="text/css">
 .loader {
 width: 48px;
@@ -91,9 +81,9 @@ inset: 6px;
             return orderId;  
         },
         onApprove: function(data, actions) {
-
-            console.log(data);
             
+            document.getElementById('is_working').classList.remove('hidden');
+
             document.getElementById("gateway_response").value =JSON.stringify( data );
             
             formData = JSON.stringify(Object.fromEntries(new FormData(document.getElementById("server_response")))),
@@ -108,10 +98,15 @@ inset: 6px;
                 body: formData,
             })
             .then(response => {
+
                 if (!response.ok) {
-                    throw new Error('Network response was not ok ' + response.statusText);
+                    return response.json().then(errorData => {
+                        throw new Error(errorData.message ?? 'Unknown error.');
+                    });
                 }
-                return response.json(); // or response.json() if the response is JSON
+                
+                return response.json();
+
             })
             .then(data => {
 
@@ -135,8 +130,6 @@ inset: 6px;
                 document.getElementById('errors').hidden = false;
             });
 
-
-
         },
         onCancel: function() {
             window.location.href = "/client/invoices/";
@@ -151,11 +144,12 @@ inset: 6px;
         },
         onClick: function (){
 
+            console.log(fundingSource);
+
             if(fundingSource != 'card')
               document.getElementById('paypal-button-container').hidden = true;
 
-            document.getElementById('is_working').classList.remove('hidden');
-
+            // document.getElementById('is_working').classList.remove('hidden');
             document.querySelector('div[data-ref="required-fields-container').classList.add('hidden');
             
         },
@@ -174,8 +168,9 @@ inset: 6px;
 		if (document.getElementById("server_response").classList.contains('is-submitting')) {
 			e.preventDefault();
 		}
-		
+
 		document.getElementById("server_response").classList.add('is-submitting');
+
 	});
 
 </script>
diff --git a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
index 928cf9e84a..172b6531e1 100644
--- a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
@@ -66,10 +66,15 @@
                 body: formData,
             })
             .then(response => {
+
                 if (!response.ok) {
-                    throw new Error('Network response was not ok ' + response.statusText);
+                    return response.json().then(errorData => {
+                        throw new Error(errorData.message ?? 'Unknown error.');
+                    });
                 }
-                return response.json();
+                
+                return response.json();                
+
             })
             .then(data => {
 

From 1ec975d99a89512cbc25167d5a0cab4901246aa6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 21 Jul 2024 11:30:21 +1000
Subject: [PATCH 2/7] Fixes for translations of statics

---
 app/Utils/TranslationHelper.php |  16 +-
 lang/ar/texts.php               |   4 +-
 lang/bg/texts.php               |  80 +++++----
 lang/ca/texts.php               |   4 +-
 lang/da/texts.php               | 296 +++++++++++++++++---------------
 lang/de/texts.php               |   4 +-
 lang/el/texts.php               |   4 +-
 lang/es/texts.php               |   4 +-
 lang/es_ES/texts.php            |   4 +-
 lang/et/texts.php               |   4 +-
 lang/fa/texts.php               |  80 +++++----
 lang/fi/texts.php               |  80 +++++----
 lang/fr/texts.php               |   4 +-
 lang/fr_CA/texts.php            |   4 +-
 lang/fr_CH/texts.php            |   4 +-
 lang/he/texts.php               |   4 +-
 lang/hr/texts.php               |  80 +++++----
 lang/hu/texts.php               |   4 +-
 lang/it/texts.php               |   4 +-
 lang/km_KH/texts.php            |   4 +-
 lang/lo_LA/texts.php            |   4 +-
 lang/lv_LV/texts.php            |  80 +++++----
 lang/mk_MK/texts.php            |  80 +++++----
 lang/nl/texts.php               |   4 +-
 lang/pl/texts.php               |   4 +-
 lang/pt_BR/texts.php            |   6 +-
 lang/pt_PT/texts.php            |   4 +-
 lang/ro/texts.php               |   4 +-
 lang/sk/texts.php               |   4 +-
 lang/sl/texts.php               |  80 +++++----
 lang/sr/texts.php               |   4 +-
 lang/sv/texts.php               |   4 +-
 lang/tr_TR/texts.php            | 159 +++++++++--------
 lang/zh_TW/texts.php            |   4 +-
 34 files changed, 569 insertions(+), 560 deletions(-)

diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php
index 19793aad89..6a7f803001 100644
--- a/app/Utils/TranslationHelper.php
+++ b/app/Utils/TranslationHelper.php
@@ -34,9 +34,9 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\Country> */
-        $countries = app('countries');
+        // $countries = app('countries');
 
-        return $countries->each(function ($country) {
+        return \App\Models\Country::all()->each(function ($country) {
             $country->name = ctrans('texts.country_'.$country->name);
         })->sortBy(function ($country) {
             return $country->iso_3166_2;
@@ -47,9 +47,9 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\PaymentType> */
-        $payment_types = app('payment_types');
+        // $payment_types = app('payment_types');
 
-        return $payment_types->each(function ($pType) {
+        return \App\Models\PaymentType::all()->each(function ($pType) {
             $pType->name = ctrans('texts.payment_type_'.$pType->name);
         })->sortBy(function ($pType) {
             return $pType->name;
@@ -60,9 +60,9 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\Language> */
-        $languages = app('languages');
+        // $languages = app('languages');
 
-        return $languages->each(function ($lang) {
+        return \App\Models\Language::all()->each(function ($lang) {
             $lang->name = ctrans('texts.lang_'.$lang->name);
         })->sortBy(function ($lang) {
             return $lang->name;
@@ -73,9 +73,9 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
-        $currencies = app('currencies');
+        // $currencies = app('currencies');
 
-        return $currencies->each(function ($currency) {
+        return \App\Models\Currency::all()->each(function ($currency) {
             $currency->name = ctrans('texts.currency_'.Str::slug($currency->name, '_'));
         })->sortBy(function ($currency) {
             return $currency->name;
diff --git a/lang/ar/texts.php b/lang/ar/texts.php
index e408e7a3e7..0b567ad130 100644
--- a/lang/ar/texts.php
+++ b/lang/ar/texts.php
@@ -1080,7 +1080,7 @@ $lang = array(
     'invoice_embed_documents' => 'تضمين المستندات',
     'invoice_embed_documents_help' => 'تضمين الصور المرفقة في الفاتورة.',
     'document_email_attachment' => 'ارفاق المستندات',
-    'ubl_email_attachment' => 'إرفاق UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'تنزيل الملفات (:حجم)',
     'documents_from_expenses' => 'من المصروفات:',
     'dropzone_default_message' => 'قم بإسقاط الملفات أو انقر للتحميل',
@@ -3026,7 +3026,7 @@ $lang = array(
     'portal_mode' => 'وضع البوابة',
     'attach_pdf' => 'إرفاق ملف PDF',
     'attach_documents' => 'ارفاق مستندات',
-    'attach_ubl' => 'إرفاق UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'نمط البريد الإلكتروني',
     'processed' => 'معالجتها',
     'fee_amount' => 'مبلغ الرسوم',
diff --git a/lang/bg/texts.php b/lang/bg/texts.php
index 716ec93c7c..ffdf66653f 100644
--- a/lang/bg/texts.php
+++ b/lang/bg/texts.php
@@ -1100,7 +1100,7 @@ $lang = array(
     'invoice_embed_documents' => 'Свързани документи',
     'invoice_embed_documents_help' => 'Включване на прикачените изображения във фактурата.',
     'document_email_attachment' => 'Прикачване на Документи',
-    'ubl_email_attachment' => 'Прикачване на UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Документи за изтегляне (:size)',
     'documents_from_expenses' => 'От разходи:',
     'dropzone_default_message' => 'Пуснете тук флайловете или кликнете за качване',
@@ -2365,7 +2365,7 @@ $lang = array(
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'Надяваме се, че използвате приложението с удоволствие.<br/>Ще се радваме, ако решите да :link!',
     'writing_a_review' => 'напишете оценка',
@@ -2881,19 +2881,6 @@ $lang = array(
     'refunded' => 'Възстановена',
     'marked_quote_as_sent' => 'Офертата е успешно маркирана като изпратена',
     'custom_module_settings' => 'Настройки на персонален модул',
-    'ticket' => 'Ticket',
-    'tickets' => 'Tickets',
-    'ticket_number' => 'Ticket #',
-    'new_ticket' => 'Нов Ticket',
-    'edit_ticket' => 'Редакция на Ticket',
-    'view_ticket' => 'Преглед на Ticket',
-    'archive_ticket' => 'Архивиране на Ticket',
-    'restore_ticket' => 'Възстановяване на Ticket',
-    'delete_ticket' => 'Изтриване на Ticket',
-    'archived_ticket' => 'Успешно архивиран Ticket',
-    'archived_tickets' => 'Успешно архивирани Tickets',
-    'restored_ticket' => 'Успешно възстановен Ticket',
-    'deleted_ticket' => 'Успешно изтрит Ticket',
     'open' => 'Open',
     'new' => 'Нов',
     'closed' => 'Closed',
@@ -2910,14 +2897,6 @@ $lang = array(
     'assigned_to' => 'Присвоен на',
     'reply' => 'Отговор',
     'awaiting_reply' => 'Очаква отговор',
-    'ticket_close' => 'Затваряне на Ticket',
-    'ticket_reopen' => 'Повторно отваряне на Ticket',
-    'ticket_open' => 'Отваряне на Ticket',
-    'ticket_split' => 'Разделяне на Ticket',
-    'ticket_merge' => 'Обединяване на Ticket',
-    'ticket_update' => 'Актуализация на Ticket',
-    'ticket_settings' => 'Настройки Ticket',
-    'updated_ticket' => 'Актуализиран Ticket',
     'mark_spam' => 'Маркирай като спам',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Името е заето',
@@ -2935,31 +2914,23 @@ $lang = array(
     'mime_types' => 'Mime типове',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Разделен със запетая списък на разрешените mime типове. Оставете празно, за да разрешите всички.',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Приоритет по подразбиране',
     'alert_new_comment_id' => 'Нов коментар',
-    'alert_comment_ticket_help' => 'С избора на шаблон ще бъде изпращано известие (към агента), когато бъде направен коментар.',
-    'alert_comment_ticket_email_help' => 'Разделени със запетая имей адреси за bcc при нов коментар.',
-    'new_ticket_notification_list' => 'Допълнителни известия за нов Ticket',
     'update_ticket_notification_list' => 'Допълнителни известия за нов коментар',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Присвояване на Ticket',
-    'alert_ticket_assign_agent_id_hel' => 'Изборът на шаблон ще активира изпращането на известие (към агента), когато тикетът е присвоен.',
-    'alert_ticket_assign_agent_id_notifications' => 'Допълнителни известия при присвояване на Ticket',
-    'alert_ticket_assign_agent_id_help' => 'Разделени със запетая имей адреси за bcc при присвояване на Ticket.',
-    'alert_ticket_transfer_email_help' => 'Разделени със запетая имей адреси за bcc при трансфер на Ticket.',
-    'alert_ticket_overdue_agent_id' => 'Просрочие на Ticket',
-    'alert_ticket_overdue_email' => 'Допълнителни известия за просрочен Ticket',
-    'alert_ticket_overdue_email_help' => 'Разделени със запетая имей адреси за bcc при просрочие на Ticket.',
-    'alert_ticket_overdue_agent_id_help' => 'С избора на шаблон ще бъде изпращано известие (към агента), когато тикетът стане просрочен.',
     'default_agent' => 'Агент по подразбиране',
     'default_agent_help' => 'Ако е избран, ще бъде присвоен на всички входящи тикет-и',
     'show_agent_details' => 'Показване на детайлите на агента при отговор',
     'avatar' => 'Аватар',
     'remove_avatar' => 'Премахване на аватар',
-    'ticket_not_found' => 'Тикетът не е намерен',
     'add_template' => 'Добавяне на шаблон',
-    'updated_ticket_template' => 'Актуализиран шаблон за Ticket',
-    'created_ticket_template' => 'Създаден шаблон за Ticket',
     'archive_ticket_template' => 'Архивиране на шаблон',
     'restore_ticket_template' => 'Възстановяване на шаблон',
     'archived_ticket_template' => 'Успешно архивиран шаблон',
@@ -3075,7 +3046,7 @@ $lang = array(
     'portal_mode' => 'Портален режим',
     'attach_pdf' => 'Прикачване на PDF',
     'attach_documents' => 'Прикачване на Документи',
-    'attach_ubl' => 'Прикачване на UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Стилове на имейла',
     'processed' => 'Обработен',
     'fee_amount' => 'Сума на таксата',
@@ -3816,7 +3787,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5304,6 +5275,33 @@ $lang = array(
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/ca/texts.php b/lang/ca/texts.php
index 2070ff00df..182be60bc3 100644
--- a/lang/ca/texts.php
+++ b/lang/ca/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Attach Documents',
-    'ubl_email_attachment' => 'Attach UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Download Documents (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -3045,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Attach PDF',
     'attach_documents' => 'Attach Documents',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
diff --git a/lang/da/texts.php b/lang/da/texts.php
index 4f9e288f35..4654f71c16 100644
--- a/lang/da/texts.php
+++ b/lang/da/texts.php
@@ -21,7 +21,7 @@ $lang = array(
     'payment_terms' => 'Betalingsvilkår',
     'currency_id' => 'Valuta',
     'size_id' => 'Virksomhedens størrelse',
-    'industry_id' => 'Sektor',
+    'industry_id' => 'Branche',
     'private_notes' => 'Private notater',
     'invoice' => 'Faktura',
     'client' => 'Kunde',
@@ -275,7 +275,7 @@ $lang = array(
     'unsaved_changes' => 'Du har ændringer som ikke er gemt',
     'custom_fields' => 'Brugerdefineret felt',
     'company_fields' => 'Selskabets felt',
-    'client_fields' => 'Kundefelt',
+    'client_fields' => 'Kunde felter',
     'field_label' => 'Felt-etikette',
     'field_value' => 'Feltets værdi',
     'edit' => 'Rediger',
@@ -397,7 +397,7 @@ $lang = array(
     'white_label_header' => 'Hvidmærket',
     'bought_white_label' => 'Hvidmærket licens accepteret',
     'white_labeled' => 'Hvidmærke',
-    'restore' => 'Genskab',
+    'restore' => 'Gendanne',
     'restore_invoice' => 'Genskab faktura',
     'restore_quote' => 'Genskab tilbud',
     'restore_client' => 'Genskab kunde',
@@ -880,7 +880,7 @@ $lang = array(
     'email_designs' => 'Email Designs',
     'assigned_when_sent' => 'Assigned when sent',
     'white_label_purchase_link' => 'Erhvérv et hvidmærket license',
-    'expense' => 'Expense',
+    'expense' => 'Udgift',
     'expenses' => 'Udgifter',
     'new_expense' => 'Indtast udgift',
     'new_vendor' => 'Ny sælger',
@@ -890,14 +890,14 @@ $lang = array(
     'archive_vendor' => 'Arkivér sælger',
     'delete_vendor' => 'Slet sælger',
     'view_vendor' => 'Vis sælger',
-    'deleted_expense' => 'Successfully deleted expense',
-    'archived_expense' => 'Successfully archived expense',
-    'deleted_expenses' => 'Successfully deleted expenses',
-    'archived_expenses' => 'Successfully archived expenses',
-    'expense_amount' => 'Expense Amount',
-    'expense_balance' => 'Expense Balance',
-    'expense_date' => 'Expense Date',
-    'expense_should_be_invoiced' => 'Should this expense be invoiced?',
+    'deleted_expense' => 'Udgift slettet succesfuldt',
+    'archived_expense' => 'Udgift arkiveret succesfuldt',
+    'deleted_expenses' => 'Udgifter slettet succesfuldt',
+    'archived_expenses' => 'Udgifter arkiveret succesfuldt',
+    'expense_amount' => 'Udgifts Beløb',
+    'expense_balance' => 'Udgifts Balance',
+    'expense_date' => 'Udgifts Dato',
+    'expense_should_be_invoiced' => 'Skal denne udgift faktureres?',
     'public_notes' => 'Public Notes',
     'invoice_amount' => 'Invoice Amount',
     'exchange_rate' => 'Exchange Rate',
@@ -905,18 +905,18 @@ $lang = array(
     'no' => 'No',
     'should_be_invoiced' => 'Should be invoiced',
     'view_expense' => 'View expense # :expense',
-    'edit_expense' => 'Edit Expense',
-    'archive_expense' => 'Archive Expense',
-    'delete_expense' => 'Delete Expense',
-    'view_expense_num' => 'Expense # :expense',
-    'updated_expense' => 'Successfully updated expense',
-    'created_expense' => 'Successfully created expense',
-    'enter_expense' => 'Enter Expense',
+    'edit_expense' => 'Redigér Udgift',
+    'archive_expense' => 'Arkiver Udgift',
+    'delete_expense' => 'Slet Udgift',
+    'view_expense_num' => 'Udgift # :expense',
+    'updated_expense' => 'Udgift opdateret succesfuldt',
+    'created_expense' => 'Udgift oprettet succesfuldt',
+    'enter_expense' => 'Indtast Udgift',
     'view' => 'View',
-    'restore_expense' => 'Restore Expense',
-    'invoice_expense' => 'Invoice Expense',
+    'restore_expense' => 'Gendan Udgift',
+    'invoice_expense' => 'Fakturer Udgift',
     'expense_error_multiple_clients' => 'The expenses can\'t belong to different clients',
-    'expense_error_invoiced' => 'Expense has already been invoiced',
+    'expense_error_invoiced' => 'Udgiftsbilag er allerede faktureret',
     'convert_currency' => 'Convert currency',
     'num_days' => 'Antal dage',
     'create_payment_term' => 'Create Payment Term',
@@ -962,7 +962,7 @@ $lang = array(
     'bank_accounts' => 'Bank Accounts',
     'add_bank_account' => 'Add Bank Account',
     'setup_account' => 'Setup Account',
-    'import_expenses' => 'Import Expenses',
+    'import_expenses' => 'Importer Udgifter',
     'bank_id' => 'bank',
     'integration_type' => 'Integration Type',
     'updated_bank_account' => 'Successfully updated bank account',
@@ -1005,7 +1005,7 @@ $lang = array(
     'trial_call_to_action' => 'Start Free Trial',
     'trial_success' => 'Successfully enabled two week free pro plan trial',
     'overdue' => 'Overdue',
-    'white_label_text' => 'Køb et ET-ÅRIGT hvidmærket licens til $:price for at fjerne Invoice Ninja-brandingen fra fakturaen og klientportalen.',
+    'white_label_text' => 'Køb et ET-ÅRIGT hvidmærket licens til $:price for at fjerne Invoice Ninja-brandingen fra fakturaen og Kundeportalen.',
     'user_email_footer' => 'For at justere varslings indstillingene besøg venligst :link',
     'reset_password_footer' => 'Hvis du ikke bad om at få nulstillet din adgangskode kontakt venligst kundeservice: :email',
     'limit_users' => 'Desværre, dette vil overstige grænsen på :limit brugere',
@@ -1018,7 +1018,7 @@ $lang = array(
     'invitation_status_sent' => 'Sendt',
     'invitation_status_opened' => 'Åbnet',
     'invitation_status_viewed' => 'Set',
-    'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
+    'email_error_inactive_client' => 'Emails kan ikke sendes til inaktive kunder',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
     'email_error_inactive_invoice' => 'Emails can not be sent to inactive invoices',
     'email_error_inactive_proposal' => 'Emails kan ikke sendes til inaktive forslag',
@@ -1027,7 +1027,7 @@ $lang = array(
     'email_error_invalid_contact_email' => 'Invalid contact email',
     'navigation' => 'Navigation',
     'list_invoices' => 'List Invoices',
-    'list_clients' => 'List Clients',
+    'list_clients' => 'Vis Kunder',
     'list_quotes' => 'List Quotes',
     'list_tasks' => 'List Tasks',
     'list_expenses' => 'List Expenses',
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Attach Documents',
-    'ubl_email_attachment' => 'Vedhæft UBL',
+    'ubl_email_attachment' => 'Vedhæft UBL/E-Faktura',
     'download_documents' => 'Download Documents (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -1216,7 +1216,7 @@ $lang = array(
     'ach_disabled' => 'En anden gateway er allerede konfigureret til direkte debitering.',
 
     'plaid' => 'Betalt',
-    'client_id' => 'Klients ID',
+    'client_id' => 'Kunde ID',
     'secret' => 'Hemmelighed',
     'public_key' => 'Offentlig nøgle',
     'plaid_optional' => '(valgfrit)',
@@ -1821,7 +1821,7 @@ $lang = array(
     'facebook_and_twitter' => 'Facebook og Twitter',
     'facebook_and_twitter_help' => 'Følg vores feeds for at hjælpe med at støtte vores projekt',
     'reseller_text' => 'Bemærk: Et hvidmærket licens er beregnet til personlig brug, så send en e-mail til os på :email, hvis du gerne vil videresælge appen.',
-    'unnamed_client' => 'Ukendt klient',
+    'unnamed_client' => 'Ukendt kunde',
 
     'day' => 'Dag',
     'week' => 'Uge',
@@ -1890,13 +1890,13 @@ $lang = array(
     'checkbox' => 'Afkrydsningsfelt',
     'invoice_signature' => 'Underskrift',
     'show_accept_invoice_terms' => 'Afkrydsningsfelt for fakturavilkår',
-    'show_accept_invoice_terms_help' => 'Bed kunden om at bekræfte, at de accepterer fakturavilkårene.',
+    'show_accept_invoice_terms_help' => 'Kunden skal acceptere fakturabetingelserne.',
     'show_accept_quote_terms' => 'Tilbuds Betingelser Afkrydsningsfelt',
-    'show_accept_quote_terms_help' => 'Bed kunden om at bekræfte, at de accepterer tilbudsbetingelserne.',
+    'show_accept_quote_terms_help' => 'Kunden skal acceptere tilbudsbetingelserne.',
     'require_invoice_signature' => 'Fakturasignatur',
-    'require_invoice_signature_help' => 'Kræv at klienten giver deres underskrift.',
+    'require_invoice_signature_help' => 'Kunden skal bekræfte med sin underskrift.',
     'require_quote_signature' => 'Tilbuds underskrift',
-    'require_quote_signature_help' => 'Kræv at klienten giver deres underskrift.',
+    'require_quote_signature_help' => 'Kunden skal bekræfte med sin underskrift.',
     'i_agree' => 'Jeg accepterer betingelserne',
     'sign_here' => 'Underskriv venligst her (Denne underskrift er juridisk bindende):',
     'sign_here_ux_tip' => 'Brug musen eller din touchpad til at spore din signatur.',
@@ -1982,9 +1982,9 @@ $lang = array(
     'postal_city_state' => 'Postnummer/By/Region',
     'phantomjs_help' => 'I visse tilfælde bruger appen :link_phantom til at danne PDF\'en, installér :link_docs for at danne den lokalt.',
     'phantomjs_local' => 'Anvender lokal PhantomJS',
-    'client_number' => 'Klientnummer',
-    'client_number_help' => 'Angiv et præfiks eller brug et brugerdefineret mønster til dynamisk angivelse af klientnummer.',
-    'next_client_number' => 'Det næste klientnummer er :number.',
+    'client_number' => 'Kundenr.',
+    'client_number_help' => 'Angiv et præfiks eller brug et brugerdefineret mønster til dynamisk angivelse af kundenr.',
+    'next_client_number' => 'Det næste kundenr. er :number.',
     'generated_numbers' => 'Dannede numre',
     'notes_reminder1' => 'Første påmindelse',
     'notes_reminder2' => 'Anden påmindelse',
@@ -1997,7 +1997,7 @@ $lang = array(
     'emailed_quotes' => 'Succesfuldt mailede citater',
     'website_url' => 'Website-URL',
     'domain' => 'Domæne',
-    'domain_help' => 'Bruges i Klient portalen og ved afsendelse af e-mails.',
+    'domain_help' => 'Bruges i Kundeportalen og ved afsendelse af e-mails.',
     'domain_help_website' => 'Bruges ved afsendelse af e-mails.',
     'import_invoices' => 'Import Fakturaer',
     'new_report' => 'Ny rapport',
@@ -2023,9 +2023,9 @@ $lang = array(
     'group_when_sorted' => 'Gruppe sortering',
     'group_dates_by' => 'Gruppér datoer efter',
     'year' => 'År',
-    'view_statement' => 'Se kontoudskrift',
+    'view_statement' => 'Se Kontoudtog',
     'statement' => 'Kontoudtog',
-    'statement_date' => 'Erklæringsdato',
+    'statement_date' => 'Kontoudtogsperiode',
     'mark_active' => 'Markér som aktiv',
     'send_automatically' => 'Send automatisk',
     'initial_email' => 'Indledende e-mail',
@@ -2058,9 +2058,9 @@ $lang = array(
     'freq_yearly' => 'Årligt',
     'profile' => 'Profil',
     'industry_Construction' => 'Konstruktion',
-    'your_statement' => 'Din erklæring',
-    'statement_issued_to' => 'Erklæring udstedt til',
-    'statement_to' => 'Erklæring til',
+    'your_statement' => 'Dit Kontoudtog',
+    'statement_issued_to' => 'Kontoudtog for',
+    'statement_to' => 'Kontoudtog til',
     'customize_options' => 'Tilpas valgmuligheder',
     'created_payment_term' => 'Succesfuldt oprettet Betaling term',
     'updated_payment_term' => 'Succesfuldt opdateret Betaling',
@@ -2068,7 +2068,7 @@ $lang = array(
     'resend_invite' => 'Send invitation igen',
     'credit_created_by' => 'Kredit oprettet ved Betaling :transaction_reference',
     'created_payment_and_credit' => 'Succesfuldt oprettet Betaling og kredit',
-    'created_payment_and_credit_emailed_client' => 'Succesfuldt oprettet Betaling og kredit, og mailet til Klient',
+    'created_payment_and_credit_emailed_client' => 'Succesfuldt oprettet betaling og kredit, og e-mailet til Kunde',
     'create_project' => 'Opret projekt',
     'create_vendor' => 'Opret Sælger',
     'create_expense_category' => 'Opret kategori',
@@ -2133,8 +2133,8 @@ $lang = array(
     'contact_phone' => 'Kontakttelefon',
     'contact_email' => 'E-mailkontakt',
     'reply_to_email' => 'Svar-til e-mail',
-    'reply_to_email_help' => 'Angiv svar-til adressen for e-mails til klienter.',
-    'bcc_email_help' => 'Inkludér denne adresse privat i e-mails til klienter.',
+    'reply_to_email_help' => 'Angiv svar-til adressen for e-mails til kunder.',
+    'bcc_email_help' => 'Inkludér denne adresse skjult i e-mails til kunder.',
     'import_complete' => 'Din import blev gennemført med succes.',
     'confirm_account_to_import' => 'Bekræft venligst din konto for at importere data.',
     'import_started' => 'Din import er påbegyndt, vi sender dig en e-mail når den er gennemført.',
@@ -2152,7 +2152,7 @@ $lang = array(
     'mark_billable' => 'Marker fakturerbar',
     'billed' => 'Faktureret',
     'company_variables' => 'Firmavariabler',
-    'client_variables' => 'Klient',
+    'client_variables' => 'Kundeoplysninger',
     'invoice_variables' => 'Faktura Variabler',
     'navigation_variables' => 'Navigationsvariabler',
     'custom_variables' => 'Speciel variabler',
@@ -2241,7 +2241,7 @@ $lang = array(
     'downloaded_quotes' => 'Der sendes en e-mail med tilbuds-pdf&#39;erne',
     'clone_expense' => 'Klon Udgift',
     'default_documents' => 'Standarddokumenter',
-    'send_email_to_client' => 'Send email til kunden',
+    'send_email_to_client' => 'Send e-mail til kunden',
     'refund_subject' => 'Refusion behandlet',
     'refund_body' => 'Du har fået behandlet en refusion på :amount for Faktura :invoice _number.',
 
@@ -2433,7 +2433,7 @@ $lang = array(
     'discard_changes' => 'Kassér ændringer',
     'tasks_not_enabled' => 'Opgaver er ikke aktiveret.',
     'started_task' => 'Succesfuldt startede Opgave',
-    'create_client' => 'Opret Klient',
+    'create_client' => 'Opret Kunde',
 
     'download_desktop_app' => 'Download desktop-appen',
     'download_iphone_app' => 'Download iPhone-appen',
@@ -2491,7 +2491,7 @@ $lang = array(
     'local_storage_required' => 'Fejl: lokal lagring er ikke tilgængelig.',
     'your_password_reset_link' => 'Dit link til nulstilling af adgangskode',
     'subdomain_taken' => 'Underdomænet er allerede i brug',
-    'client_login' => 'Client log ing',
+    'client_login' => 'Kunde login',
     'converted_amount' => 'Ombygget Beløb',
     'default' => 'Standard',
     'shipping_address' => 'Forsendelsesadresse',
@@ -2509,10 +2509,10 @@ $lang = array(
     'shipping_postal_code' => 'Forsendelses postnummer',
     'shipping_country' => 'Forsendelsesland',
     'classify' => 'Klassificer',
-    'show_shipping_address_help' => 'Kræv, at Klient oplyser deres leveringsadresse',
+    'show_shipping_address_help' => 'Kræv at kunden angiver leveringsadresse',
     'ship_to_billing_address' => 'Send til faktureringsadresse',
     'delivery_note' => 'Levering Bemærk',
-    'show_tasks_in_portal' => 'Vis opgaver i Klient portalen',
+    'show_tasks_in_portal' => 'Vis opgaver i Kundeportalen',
     'cancel_schedule' => 'Afbryd Skema',
     'scheduled_report' => 'Planlagt rapport',
     'scheduled_report_help' => 'e-mail :report -rapporten som :format til :email',
@@ -2534,7 +2534,7 @@ $lang = array(
     'target_url' => 'Mål',
     'target_url_help' => 'Når den valgte hændelse indtræffer, vil appen sende enheden til mål-URL&#39;en.',
     'event' => 'Begivenhed',
-    'subscription_event_1' => 'oprettet Klient',
+    'subscription_event_1' => 'Kunden er oprettet',
     'subscription_event_2' => 'oprettet Faktura',
     'subscription_event_3' => 'oprettet Citat',
     'subscription_event_4' => 'oprettet Betaling',
@@ -2543,8 +2543,8 @@ $lang = array(
     'subscription_event_7' => 'slettet Citat',
     'subscription_event_8' => 'Faktura blev opdateret',
     'subscription_event_9' => 'slettet Faktura',
-    'subscription_event_10' => 'Klient blev opdateret',
-    'subscription_event_11' => 'slettet Klient',
+    'subscription_event_10' => 'Kunden blev opdateret',
+    'subscription_event_11' => 'Kunden blev slettet',
     'subscription_event_12' => 'slettet Betaling',
     'subscription_event_13' => 'Sælger blev opdateret',
     'subscription_event_14' => 'slettet Sælger',
@@ -2561,7 +2561,7 @@ $lang = array(
     'edit_subscription' => 'Redigér Abonnement',
     'archive_subscription' => 'Arkiv Abonnement',
     'archived_subscription' => 'Succesfuldt arkiveret abonnement',
-    'project_error_multiple_clients' => 'Projekter kan ikke tilhøre flere klienter',
+    'project_error_multiple_clients' => 'Projekter kan ikke tilhøre flere kunder',
     'invoice_project' => 'Fakturér projekt',
     'module_recurring_invoice' => 'Gentagen Fakturaer',
     'module_credit' => 'Credits',
@@ -2597,23 +2597,23 @@ $lang = array(
     'archive_status' => 'Arkiv Status',
     'new_status' => 'Ny status',
     'convert_products' => 'Konverter produkter',
-    'convert_products_help' => 'Konverter automatisk produktpriser til Klient valuta',
-    'improve_client_portal_link' => 'Indstil et underdomæne for at forkorte Klient portallinket.',
+    'convert_products_help' => 'Konverter automatisk produktpriser til kundens valuta',
+    'improve_client_portal_link' => 'Indstil et underdomæne for at forkorte linket til Kundeportalen.',
     'budgeted_hours' => 'Budgetterede timer',
     'progress' => 'Fremskridt',
     'view_project' => 'Vis projekt',
     'summary' => 'Resumé',
     'endless_reminder' => 'Uendelig påmindelse',
-    'signature_on_invoice_help' => 'Tilføj følgende kode for at vise din Klient signatur på PDF .',
+    'signature_on_invoice_help' => 'Tilføj følgende kode for at vise din Kundes signatur på PDF .',
     'signature_on_pdf' => 'Vis på PDF',
-    'signature_on_pdf_help' => 'Vis Klient på Faktura /citat PDF .',
+    'signature_on_pdf_help' => 'Vis Kunde på Faktura /Tilbud PDF .',
     'expired_white_label' => 'Hvidmærke-licens er udløbet',
     'return_to_login' => 'Vend tilbage til login',
     'convert_products_tip' => 'Bemærk : Tilføj en :link med navnet &quot; :name &quot; for at se valutakursen.',
     'amount_greater_than_balance' => 'Beløb er større end Faktura saldoen, en kredit vil blive oprettet med det resterende Beløb .',
     'custom_fields_tip' => 'Brug <code>Label|Option1,Option2</code> for at vise en markeringsboks.',
-    'client_information' => 'Klient',
-    'updated_client_details' => 'Succesfuldt opdateret Klient',
+    'client_information' => 'Kundeoplysninger',
+    'updated_client_details' => 'Kundeoplysningerne blev opdateret',
     'auto' => 'Auto',
     'tax_amount' => 'Skat Beløb',
     'tax_paid' => 'Skat betalt',
@@ -2694,7 +2694,7 @@ $lang = array(
     'no_assets' => 'Ingen billeder, træk for at uploade',
     'add_image' => 'Tilføj billede',
     'select_image' => 'Vælg Billede',
-    'upgrade_to_upload_images' => 'Upgrade to the Enterprise Plan to upload files & images',
+    'upgrade_to_upload_images' => 'Opgrader til Enterprise for at uploade filer & billeder',
     'delete_image' => 'Slet billede',
     'delete_image_help' => 'Advarsel: Hvis du sletter billedet, fjernes det fra alle forslag.',
     'amount_variable_help' => 'Bemærk : Faktura $ Beløb feltet vil bruge del-/indbetalingsfeltet, hvis det er angivet, ellers vil det bruge Faktura saldoen.',
@@ -2742,14 +2742,14 @@ $lang = array(
     'auto_archive_quote' => 'Auto Arkiv',
     'auto_archive_quote_help' => 'Arkiv automatisk citater ved konvertering til Faktura .',
     'require_approve_quote' => 'Kræv godkend tilbud',
-    'require_approve_quote_help' => 'Kræv, at Klienter godkender tilbud.',
+    'require_approve_quote_help' => 'Kræv, at Kunder godkender tilbud.',
     'allow_approve_expired_quote' => 'Tillad godkend udløbet tilbud',
-    'allow_approve_expired_quote_help' => 'Tillad Klienter at godkende udløbne tilbud.',
+    'allow_approve_expired_quote_help' => 'Tillad at Kunden kan godkende udløbne tilbud.',
     'invoice_workflow' => 'Faktura Workflow',
     'quote_workflow' => 'Citat Workflow',
-    'client_must_be_active' => 'Fejl: Klient skal være aktiv',
-    'purge_client' => 'Rens Klient',
-    'purged_client' => 'Succesfuldt renset Klient',
+    'client_must_be_active' => 'Fejl: Kunden skal være aktiv',
+    'purge_client' => 'Ryd Kunde',
+    'purged_client' => 'Kunden blev ryddet/opdateret',
     'purge_client_warning' => 'Alle relaterede poster ( Fakturaer , opgaver, udgifter, dokumenter osv.) vil også blive slettet .',
     'clone_product' => 'Klon produkt',
     'item_details' => 'Varedetaljer',
@@ -2831,7 +2831,7 @@ $lang = array(
     'count_selected' => ':count valgt',
     'dismiss' => 'Afskedige',
     'please_select_a_date' => 'Vælg venligst en dato',
-    'please_select_a_client' => 'Vælg venligst en Klient',
+    'please_select_a_client' => 'Vælg venligst en Kunde',
     'language' => 'Sprog',
     'updated_at' => 'Opdateret',
     'please_enter_an_invoice_number' => 'Indtast venligst et Faktura nummer',
@@ -2846,7 +2846,7 @@ $lang = array(
     'invoice_status_5' => 'Delvis',
     'invoice_status_6' => 'Betalt',
     'marked_invoice_as_sent' => 'Succesfuldt markeret Faktura som sendt',
-    'please_enter_a_client_or_contact_name' => 'Indtast et Klient eller kontakt',
+    'please_enter_a_client_or_contact_name' => 'Indtast en Kunde eller kontakt',
     'restart_app_to_apply_change' => 'Genstart appen for at anvende ændringen',
     'refresh_data' => 'Opdater data',
     'blank_contact' => 'Blank kontakt',
@@ -2875,7 +2875,7 @@ $lang = array(
     'payment_status_4' => 'Afsluttet',
     'payment_status_5' => 'Delvist refunderet',
     'payment_status_6' => 'Refunderet',
-    'send_receipt_to_client' => 'Send kvittering til Klient',
+    'send_receipt_to_client' => 'Send kvittering til Kunde',
     'refunded' => 'Refunderet',
     'marked_quote_as_sent' => 'Succesfuldt markeret tilbud som sendt',
     'custom_module_settings' => 'Speciel Modul Indstillinger',
@@ -2905,20 +2905,20 @@ $lang = array(
     'local_part_placeholder' => 'DIT NAVN',
     'from_name_placeholder' => 'Supportcenter',
     'attachments' => 'Vedhæftede filer',
-    'client_upload' => 'Klient uploads',
-    'enable_client_upload_help' => 'Tillad Klienter at uploade dokumenter/vedhæftede filer',
+    'client_upload' => 'Upload Kunder',
+    'enable_client_upload_help' => 'Tillad Kunder at upload\'e dokumenter/vedhæftede filer',
     'max_file_size_help' => 'Maksimal filstørrelse (KB) er begrænset af dine post_max_size og upload_max_filesize variabler som angivet i din PHP.INI',
     'max_file_size' => 'Maksimal filstørrelse',
     'mime_types' => 'Mime typer',
     'mime_types_placeholder' => '. PDF , .docx, .jpg',
     'mime_types_help' => 'Kommasepareret liste over tilladte mime-typer, lad tom for alle',
-    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
-    'new_ticket_template_id' => 'New ticket',
-    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
-    'update_ticket_template_id' => 'Updated ticket',
-    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
-    'close_ticket_template_id' => 'Closed ticket',
-    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
+    'ticket_number_start_help' => 'Ticket nummer skal være større en nyværende ticket nummer',
+    'new_ticket_template_id' => 'Ny ticket',
+    'new_ticket_autoresponder_help' => 'Valg af en skabelon vil sende et auto-svar til en kunde/kontakt når en ny sag oprettes',
+    'update_ticket_template_id' => 'Opdater ticket',
+    'update_ticket_autoresponder_help' => 'Valg af en skabelon vil sende et auto-svar til en kunde/kontakt når en sag bliver opdateret',
+    'close_ticket_template_id' => 'Luk ticket',
+    'close_ticket_autoresponder_help' => 'Valg af en skabelon vil sende et auto-svar til en kunde/kontakt når en sag lukkes',
     'default_priority' => 'Standardprioritet',
     'alert_new_comment_id' => 'Ny kommentar',
     'update_ticket_notification_list' => 'Yderligere meddelelser om nye kommentarer',
@@ -3044,7 +3044,7 @@ $lang = array(
     'portal_mode' => 'Portaltilstand',
     'attach_pdf' => 'Vedhæft PDF',
     'attach_documents' => 'Vedhæft dokumenter',
-    'attach_ubl' => 'Vedhæft UBL',
+    'attach_ubl' => 'Vedhæft UBL/E-Faktura',
     'email_style' => 'e-mail stil',
     'processed' => 'Bearbejdet',
     'fee_amount' => 'Gebyr Beløb',
@@ -3052,8 +3052,8 @@ $lang = array(
     'fee_cap' => 'Gebyrloft',
     'limits_and_fees' => 'Grænser/gebyrer',
     'credentials' => 'Legitimationsoplysninger',
-    'require_billing_address_help' => 'Kræv, at Klient oplyser deres faktureringsadresse',
-    'require_shipping_address_help' => 'Kræv, at Klient oplyser deres leveringsadresse',
+    'require_billing_address_help' => 'Kræv at kunden angiver faktureringsadresse',
+    'require_shipping_address_help' => 'Kræv at kunden angiver leveringsadresse',
     'deleted_tax_rate' => 'Succesfuldt slettet skattesats',
     'restored_tax_rate' => 'Succesfuldt genskabt skattesats',
     'provider' => 'Udbyder',
@@ -3079,7 +3079,7 @@ $lang = array(
     'timezone' => 'Tidszone',
     'filtered_by_group' => 'Filtreret efter gruppe',
     'filtered_by_invoice' => 'Filtreret efter Faktura',
-    'filtered_by_client' => 'Filtreret af Klient',
+    'filtered_by_client' => 'Filter: Kunde ',
     'filtered_by_vendor' => 'Filtreret af Sælger',
     'group_settings' => 'Gruppe Indstillinger',
     'groups' => 'Grupper',
@@ -3116,10 +3116,10 @@ $lang = array(
     'product2' => 'Speciel produkt 2',
     'product3' => 'Speciel produkt 3',
     'product4' => 'Speciel produkt 4',
-    'client1' => 'Speciel Klient',
-    'client2' => 'Speciel Klient 2',
-    'client3' => 'Speciel Klient',
-    'client4' => 'Speciel Klient',
+    'client1' => 'Speciel Kunde 1',
+    'client2' => 'Speciel Kunde 2',
+    'client3' => 'Speciel Kunde 3',
+    'client4' => 'Speciel Kunde 4',
     'contact1' => 'Speciel kontakt 1',
     'contact2' => 'Speciel kontakt 2',
     'contact3' => 'Speciel kontakt 3',
@@ -3185,8 +3185,8 @@ $lang = array(
     'credit_email' => 'Kredit e-mail',
     'domain_url' => 'Domæne-URL',
     'password_is_too_easy' => 'Adgangskoden skal indeholde et stort bogstav og et tal',
-    'client_portal_tasks' => 'Klient',
-    'client_portal_dashboard' => 'Klient Portal Dashboard',
+    'client_portal_tasks' => 'Kundeportalen Opgaver',
+    'client_portal_dashboard' => 'Kundeportalen Dashboard',
     'please_enter_a_value' => 'Indtast venligst en værdi',
     'deleted_logo' => 'Succesfuldt slettet logo',
     'generate_number' => 'Generer nummer',
@@ -3276,15 +3276,15 @@ $lang = array(
     'email_subject_quote' => 'e-mail Citat Emne',
     'email_subject_payment' => 'e-mail Betaling Emne',
     'switch_list_table' => 'Skift listetabel',
-    'client_city' => 'Klient City',
-    'client_state' => 'Klient',
-    'client_country' => 'Klient',
-    'client_is_active' => 'Klient er aktiv',
-    'client_balance' => 'Klient balance',
-    'client_address1' => 'Klient Street',
-    'client_address2' => 'Klient Apt/Suite',
-    'client_shipping_address1' => 'Klient Shipping Street',
-    'client_shipping_address2' => 'Klient Shipping Apt/Suite',
+    'client_city' => 'Kunde By',
+    'client_state' => 'Kunde Region/Område',
+    'client_country' => 'Kunde Land',
+    'client_is_active' => 'Kunde er aktiv',
+    'client_balance' => 'Kunde Saldo',
+    'client_address1' => 'Kunde Gade/Vej',
+    'client_address2' => 'Kunde Etage/Lejl.',
+    'client_shipping_address1' => 'Kunde Levering Gade/Vej',
+    'client_shipping_address2' => 'Kunde Levering Etage/Lejl.',
     'tax_rate1' => 'Skattesats 1',
     'tax_rate2' => 'Skattesats 2',
     'tax_rate3' => 'Skattesats 3',
@@ -3313,7 +3313,7 @@ $lang = array(
     'license' => 'Licens',
     'invoice_balance' => 'Faktura Balance',
     'saved_design' => 'Succesfuldt gemt design',
-    'client_details' => 'Klient',
+    'client_details' => 'Kundeoplysninger',
     'company_address' => 'Virksomhedens adresse',
     'quote_details' => 'Citat detaljer',
     'credit_details' => 'Kreditoplysninger',
@@ -3367,7 +3367,7 @@ $lang = array(
     'migration_went_wrong' => 'Ups! Noget gik galt! Sørg for, at du har opsat en Faktura Ninja v5-instans, før du starter migreringen.',
     'cross_migration_message' => 'Migrering på tværs af konti er ikke tilladt. Læs mere om det her: <a href="https://invoiceninja.github.io/docs/migration/#troubleshooting">https://invoiceninja.github.io/docs/migration/#troubleshooting</a>',
     'email_credit' => 'e-mail Kredit',
-    'client_email_not_set' => 'Klient har ikke angivet en e-mail',
+    'client_email_not_set' => 'Kunden har ikke angivet en e-mail',
     'ledger' => 'Hovedbog',
     'view_pdf' => 'Vis PDF',
     'all_records' => 'Alle optegnelser',
@@ -3400,7 +3400,7 @@ $lang = array(
     'search_documents' => 'Søg i dokumenter',
     'search_designs' => 'Søg designs',
     'search_invoices' => 'Søg Fakturaer',
-    'search_clients' => 'Søg efter Klienter',
+    'search_clients' => 'Søg efter Kunder',
     'search_products' => 'Søg efter produkter',
     'search_quotes' => 'Søg citater',
     'search_credits' => 'Søg Credits',
@@ -3469,7 +3469,7 @@ $lang = array(
     'gross' => 'Brutto',
     'net_amount' => 'Net Beløb',
     'net_balance' => 'Nettobalance',
-    'client_settings' => 'Klient Indstillinger',
+    'client_settings' => 'Indstillinger Kundeoplysninger',
     'selected_invoices' => 'Udvalgte Fakturaer',
     'selected_payments' => 'Valgte Betalinger',
     'selected_quotes' => 'Udvalgte citater',
@@ -3479,7 +3479,7 @@ $lang = array(
     'create_payment' => 'Opret Betaling',
     'update_quote' => 'Opdater citat',
     'update_invoice' => 'Opdater Faktura',
-    'update_client' => 'Opdater Klient',
+    'update_client' => 'Opdatér Kundeoplysninger',
     'update_vendor' => 'Opdater Sælger',
     'create_expense' => 'Opret Udgift',
     'update_expense' => 'Opdater Udgift',
@@ -3511,13 +3511,13 @@ $lang = array(
     'new_token' => 'Ny token',
     'removed_token' => 'Succesfuldt fjernet token',
     'restored_token' => 'Succesfuldt genskabt token',
-    'client_registration' => 'Klient',
-    'client_registration_help' => 'Giv Klienter mulighed for selv at registrere sig i portalen',
+    'client_registration' => 'Kunde Oprettelse',
+    'client_registration_help' => 'Giv Kunder adgang til at oprette sig i Kundeportalen',
     'customize_and_preview' => 'Tilpas &amp; Preview',
     'search_document' => 'Søg i 1 dokument',
     'search_design' => 'Søg 1 Design',
     'search_invoice' => 'Søg 1 Faktura',
-    'search_client' => 'Søg 1 Klient',
+    'search_client' => 'Søg 1 Kunde',
     'search_product' => 'Søg 1 produkt',
     'search_quote' => 'Søg 1 citat',
     'search_credit' => 'Søg 1 kredit',
@@ -3539,7 +3539,7 @@ $lang = array(
     'force_update_help' => 'Du kører den seneste version, men der kan være afventende rettelser tilgængelige.',
     'mark_paid_help' => 'Spor Udgift er betalt',
     'mark_invoiceable_help' => 'Aktiver Udgift til at blive faktureret',
-    'add_documents_to_invoice_help' => 'Gør dokumenterne synlige for Klient',
+    'add_documents_to_invoice_help' => 'Gør dokumenterne synlige for Kunden',
     'convert_currency_help' => 'Indstil en valutakurs',
     'expense_settings' => 'Udgift Indstillinger',
     'clone_to_recurring' => 'Klon til Gentagen',
@@ -3631,11 +3631,11 @@ $lang = array(
     'late_invoice' => 'Sen Faktura',
     'expired_quote' => 'Udløbet citat',
     'remind_invoice' => 'Mind Faktura',
-    'client_phone' => 'Klient Telefon',
+    'client_phone' => 'Kunde Telefon',
     'required_fields' => 'krævede felter',
     'enabled_modules' => 'Aktiverede moduler',
     'activity_60' => ':contact set citat :quote',
-    'activity_61' => ':user opdateret Klient :client',
+    'activity_61' => ':user opdaterede Kunde :client',
     'activity_62' => ':user opdateret Sælger :vendor',
     'activity_63' => ':user e-mailede den første påmindelse for Faktura :invoice til :contact',
     'activity_64' => ':user e-mailede anden påmindelse for Faktura :invoice til :contact',
@@ -3732,7 +3732,7 @@ $lang = array(
     'converted_balance' => 'Konverteret saldo',
     'is_sent' => 'Er sendt',
     'document_upload' => 'Dokument upload',
-    'document_upload_help' => 'Aktiver Klienter for at uploade dokumenter',
+    'document_upload_help' => 'Tillad Kunder at upload\'e dokumenter/vedhæftede filer',
     'expense_total' => 'Udgift total',
     'enter_taxes' => 'Indtast Skatter',
     'by_rate' => 'Efter sats',
@@ -3754,8 +3754,8 @@ $lang = array(
     'next_step' => 'Næste skridt',
     'notification_credit_sent_subject' => 'Kredit :invoice blev sendt til :client',
     'notification_credit_viewed_subject' => 'Kredit :invoice blev set af :client',
-    'notification_credit_sent' => 'Følgende Klient :client blev sendt via e-mail Kredit :invoice for :amount .',
-    'notification_credit_viewed' => 'Følgende Klient :client så Kredit :credit for :amount .',
+    'notification_credit_sent' => 'Følgende Kunde :client fik sendt Kredit :invoice for :amount via e-mail.',
+    'notification_credit_viewed' => 'Følgende Kunde:client så Kredit :credit for :amount .',
     'reset_password_text' => 'Indtast din e-mail for at nulstille din adgangskode.',
     'password_reset' => 'Nulstil kodeord',
     'account_login_text' => 'Velkommen! Glad for at se dig.',
@@ -3785,7 +3785,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity _nummer',
     'email_link_not_working' => 'Hvis knappen ovenfor ikke virker for dig, så klik venligst på linket',
     'display_log' => 'Vis log',
-    'send_fail_logs_to_our_server' => 'Rapporter fejl i realtid',
+    'send_fail_logs_to_our_server' => 'Rapporter fejl for at hjælpe med at forbedre app\'en',
     'setup' => 'Opsætning',
     'quick_overview_statistics' => 'Hurtigt overblik og statistik',
     'update_your_personal_info' => 'Opdater dine personlige oplysninger',
@@ -3932,7 +3932,7 @@ $lang = array(
     'refund_without_invoices' => 'Forsøg på at tilbagebetale en Betaling med <span class=\'notranslate\'>Faktura er</span> vedhæftet, bedes du angive gyldige Faktura /s, der skal refunderes.',
     'refund_without_credits' => 'Forsøg på at tilbagebetale en Betaling med vedhæftede kreditter, bedes du angive gyldige kreditter, der skal refunderes.',
     'max_refundable_credit' => 'Forsøg på at refundere mere end tilladt for kredit :credit , maksimalt refunderbart Beløb er :amount',
-    'project_client_do_not_match' => 'Project Klient matcher ikke Klient',
+    'project_client_do_not_match' => 'Projektets Kundeoplysninger matcher ikke Kunden',
     'quote_number_taken' => 'Citatnummer er allerede taget',
     'recurring_invoice_number_taken' => 'Gentagen Faktura nummer :number allerede taget',
     'user_not_associated_with_account' => 'Bruger er ikke tilknyttet denne konto',
@@ -4048,7 +4048,7 @@ $lang = array(
     'connected_gmail' => 'Succesfuldt forbundet Gmail',
     'disconnected_gmail' => 'Succesfuldt afbrudt Gmail',
     'update_fail_help' => 'Ændringer i kodebasen blokerer muligvis for opdateringen. Du kan køre denne kommando for at kassere ændringerne:',
-    'client_id_number' => 'Klient ID-nummer',
+    'client_id_number' => 'Kunde ID-nr.',
     'count_minutes' => ':count Minutter',
     'password_timeout' => 'Adgangskode timeout',
     'shared_invoice_credit_counter' => 'Del Faktura /Kredittæller',
@@ -4059,12 +4059,12 @@ $lang = array(
     'activity_84' => ':user genskabt abonnement :subscription',
     'amount_greater_than_balance_v5' => 'Beløb er større end Faktura balancen. Du kan ikke overbetale en Faktura .',
     'click_to_continue' => 'Klik for at fortsætte',
-    'notification_invoice_created_body' => 'Følgende Faktura :invoice blev oprettet for Klient :client for :amount .',
+    'notification_invoice_created_body' => 'Følgende Faktura :invoice blev oprettet for Kunde :client for :amount .',
     'notification_invoice_created_subject' => 'Faktura :invoice blev oprettet for :client',
-    'notification_quote_created_body' => 'Følgende citat :invoice blev oprettet for Klient :client for :amount .',
-    'notification_quote_created_subject' => 'Citat :invoice blev oprettet for :client',
-    'notification_credit_created_body' => 'Følgende kredit :invoice blev oprettet for Klient :client for :amount .',
-    'notification_credit_created_subject' => 'Kredit :invoice blev oprettet for :client',
+    'notification_quote_created_body' => 'Følgende tilbud :invoice blev oprettet for Kunde :client for :amount .',
+    'notification_quote_created_subject' => 'Tilbud :invoice blev oprettet for :client',
+    'notification_credit_created_body' => 'Følgende kreditering :invoice blev oprettet for Kunde :clientmed :amount.',
+    'notification_credit_created_subject' => 'Kreditering :invoice blev oprettet for :client',
     'max_companies' => 'Maksimal virksomheder migrerede',
     'max_companies_desc' => 'Du har nået dit maksimale antal virksomheder. Slet eksisterende virksomheder for at migrere nye.',
     'migration_already_completed' => 'Virksomheden er allerede migreret',
@@ -4197,7 +4197,7 @@ $lang = array(
     'persist_data_help' => 'Gem data lokalt for at gøre det muligt for appen at starte hurtigere. Deaktivering kan forbedre ydeevnen på store konti',
     'persist_ui' => 'Vedvarende UI',
     'persist_ui_help' => 'Gem UI-tilstand lokalt for at aktivere appen til at starte på den sidste placering, deaktivering kan forbedre ydeevnen',
-    'client_postal_code' => 'Klient postnummer',
+    'client_postal_code' => 'Kunde Postnummer',
     'client_vat_number' => 'Klient momsnummer',
     'has_tasks' => 'Har opgaver',
     'registration' => 'Registrering',
@@ -4374,7 +4374,7 @@ $lang = array(
     'client_shipping_country' => 'Klient forsendelsesland',
     'load_pdf' => 'Indlæs PDF',
     'start_free_trial' => 'Start gratis prøveperiode',
-    'start_free_trial_message' => 'Start your FREE 14 day trial of the Pro Plan',
+    'start_free_trial_message' => 'Start din GRATIS 14 dages prove af Pro Plan',
     'due_on_receipt' => 'Forfalder ved modtagelse',
     'is_paid' => 'Er betalt',
     'age_group_paid' => 'Betalt',
@@ -4771,11 +4771,11 @@ $lang = array(
     'action_add_to_invoice' => 'Tilføj til Faktura',
     'danger_zone' => 'Farezone',
     'import_completed' => 'Import afsluttet',
-    'client_statement_body' => 'Din erklæring fra :start _date til :end _date er vedhæftet.',
+    'client_statement_body' => 'Dit kontoudtog fra :start _date til :end _date er vedhæftet.',
     'email_queued' => 'e-mail i kø',
     'clone_to_recurring_invoice' => 'Klon til Gentagen Faktura',
     'inventory_threshold' => 'Beholdningstærskel',
-    'emailed_statement' => 'Succesfuldt erklæring i kø skal sendes',
+    'emailed_statement' => 'Succesfuldt sat kontoudtog i kø til afsendelse',
     'show_email_footer' => 'Vis e-mail -sidefod',
     'invoice_task_hours' => 'Faktura Opgave Timer',
     'invoice_task_hours_help' => 'Tilføj timerne til Faktura linjeposterne',
@@ -4805,7 +4805,7 @@ $lang = array(
     'show_aging_table' => 'Vis aldringstabel',
     'show_payments_table' => 'Vis Betalinger Tabel',
     'only_clients_with_invoices' => 'Kun Klienter med Fakturaer',
-    'email_statement' => 'e-mail erklæring',
+    'email_statement' => 'E-mail Kontoudtog',
     'once' => 'Enkelt gang',
     'schedules' => 'Tidsplaner',
     'new_schedule' => 'Nyt skema',
@@ -5259,7 +5259,7 @@ $lang = array(
     'task_round_to_nearest_help' => 'Afrundingsinterval for opgaven.',
     'bulk_updated' => 'Data opdateret succesfuldt',
     'bulk_update' => 'Bulk opdater',
-    'calculate' => 'Calculate',
+    'calculate' => 'Beregn',
     'sum' => 'Sum',
     'money' => 'Penge',
     'web_app' => 'Web App',
@@ -5271,21 +5271,35 @@ $lang = array(
     'btcpay_refund_body' => 'En refundering til dig er blevet udstedt. For at gøre krav på det via BTCPay, klik venligst på dette link:',
     'currency_mauritanian_ouguiya' => 'Mauritanian Ouguiya',
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
-    'end_of_month' => 'End Of Month',
-    'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
-    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
-    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
-    'activity_141' => 'User :user entered note: :notes',
-    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
-    'quote_reminder_message' => 'Reminder for quote :number for :amount',
-    'quote_reminder1' => 'First Quote Reminder',
-    'before_valid_until_date' => 'Before the valid until date',
-    'after_valid_until_date' => 'After the valid until date',
-    'after_quote_date' => 'After the quote date',
-    'remind_quote' => 'Remind Quote',
-    'end_of_month' => 'End Of Month',
-    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
-    'edocument_import_already_exists' => 'The invoice has already been imported on :date'
+    'end_of_month' => 'Sidste i måneden',
+    'merge_e_invoice_to_pdf' => 'Sammenflet E-Faktura og PDF',
+    'task_assigned_subject' => 'Ny opgave tildelt [Opgave :task ] [ :date ]',
+    'task_assigned_body' => 'Du er blevet tildelt opgave :task<br><br> Beskrivelse: :beskrivelse<br><br> Kunde : :client',
+    'activity_141' => 'Bruger :user indtastet notat: :notes',
+    'quote_reminder_subject' => 'Påmindelse: Tilbud :quote fra :company',
+    'quote_reminder_message' => 'Påmindelse vedrørende tilbud :number for :amount',
+    'quote_reminder1' => 'Første Tilbuds påmindelse',
+    'before_valid_until_date' => 'Inden gyldig indtil dato',
+    'after_valid_until_date' => 'Efter den gyldige indtil dato',
+    'after_quote_date' => 'Efter tilbuds dato',
+    'remind_quote' => 'Tilbudspåmindelse',
+    'end_of_month' => 'Sidste i måneden',
+    'tax_currency_mismatch' => 'Skatte valuta er forskellig fra faktura valuta',
+    'edocument_import_already_exists' => 'Faktura er allerede blevet importeret den :date',
+    'before_valid_until' => 'Før gældende indtil',
+    'after_valid_until' => 'Efter den gældende indtil',
+    'task_assigned_notification' => 'Opgave Tildelte Underretning',
+    'task_assigned_notification_help' => 'Send en e-mail når en opgave bliver tildelt',
+    'invoices_locked_end_of_month' => 'Fakturaer er låst i slutningen af måneden',
+    'referral_url' => 'Henvisnings-URL',
+    'add_comment' => 'Tilføj kommentar',
+    'added_comment' => 'Kommentar gemt successfuldt',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Gruppe tildelt successfuldt',
+    'merge_to_pdf' => 'Sammenflet til PDF',
+    'latest_requires_php_version' => 'Bemærk: den seneste version kræver PHP :version',
+    'auto_expand_product_table_notes' => 'Udvid automatisk produkt tabel noter',
+    'auto_expand_product_table_notes_help' => 'Udvider automatisk notesektionen i produkt tabellen til at vise flere linjer.',
 );
 
 return $lang;
diff --git a/lang/de/texts.php b/lang/de/texts.php
index 24d7c12f6c..e8ca2e7e7a 100644
--- a/lang/de/texts.php
+++ b/lang/de/texts.php
@@ -1100,7 +1100,7 @@ $lang = array(
     'invoice_embed_documents' => 'Dokumente einbetten',
     'invoice_embed_documents_help' => 'Bildanhänge zu den Rechnungen hinzufügen.',
     'document_email_attachment' => 'Dokumente anhängen',
-    'ubl_email_attachment' => 'UBL anhängen',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Dokumente herunterladen (:size)',
     'documents_from_expenses' => 'Von Kosten:',
     'dropzone_default_message' => 'Dateien hierhin ziehen oder klicken, um Dateien hochzuladen',
@@ -3046,7 +3046,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'portal_mode' => 'Portalmodus',
     'attach_pdf' => 'PDF anhängen',
     'attach_documents' => 'Dokumente anhängen',
-    'attach_ubl' => 'UBL anhängen',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'E-Mail-Stil',
     'processed' => 'Verarbeitet',
     'fee_amount' => 'Zuschlag Betrag',
diff --git a/lang/el/texts.php b/lang/el/texts.php
index 1428401d8a..9ff52a5d09 100644
--- a/lang/el/texts.php
+++ b/lang/el/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Ενσωματωμένα Έγγραφα',
     'invoice_embed_documents_help' => 'Συμπεριλάβετε τις συνημμένες εικόνες στο τιμολόγιο',
     'document_email_attachment' => 'Επισύναψη Εγγράφων',
-    'ubl_email_attachment' => 'Επισύναψε UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Κατέβασμα Εγγράφων (:size)',
     'documents_from_expenses' => 'Από Δαπάνες:',
     'dropzone_default_message' => 'Σύρετε τα αρχεία ή κάντε κλικ για μεταφόρτωση',
@@ -3045,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Περιβάλλον Portal',
     'attach_pdf' => 'Επισύναψε PDF',
     'attach_documents' => 'Επισύναψη Εγγράφων',
-    'attach_ubl' => 'Επισύναψη UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Στυλ Email',
     'processed' => 'Επεξεργάσθηκε',
     'fee_amount' => 'Ποσό Τέλους',
diff --git a/lang/es/texts.php b/lang/es/texts.php
index dc184ceb40..a53b342bf5 100644
--- a/lang/es/texts.php
+++ b/lang/es/texts.php
@@ -1098,7 +1098,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Attach Documents',
-    'ubl_email_attachment' => 'Adjuntar UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Download Documents (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -3044,7 +3044,7 @@ $lang = array(
     'portal_mode' => 'Modo portal',
     'attach_pdf' => 'Adjuntar PDF',
     'attach_documents' => 'Adjuntar Documentos',
-    'attach_ubl' => 'Adjuntar UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Estilo de correo electrónico',
     'processed' => 'Procesada',
     'fee_amount' => 'Importe de la cuota',
diff --git a/lang/es_ES/texts.php b/lang/es_ES/texts.php
index ee6a8d5362..8bad35c312 100644
--- a/lang/es_ES/texts.php
+++ b/lang/es_ES/texts.php
@@ -1095,7 +1095,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documentos anexados',
     'invoice_embed_documents_help' => 'Incluye imagenes adjuntas en la factura',
     'document_email_attachment' => 'Adjuntar documentos',
-    'ubl_email_attachment' => 'Adjuntar URL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Descargar documentos (:size)',
     'documents_from_expenses' => 'De los Gastos:',
     'dropzone_default_message' => 'Arrastra ficheros aquí o Haz clic para subir',
@@ -3041,7 +3041,7 @@ Una vez que tenga los montos, vuelva a esta página de métodos de pago y haga c
     'portal_mode' => 'Modo portal',
     'attach_pdf' => 'Adjuntar PDF',
     'attach_documents' => 'Adjuntar Documentos',
-    'attach_ubl' => 'Adjuntar UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Estilo de correo electrónico',
     'processed' => 'Procesado',
     'fee_amount' => 'Importe de la cuota',
diff --git a/lang/et/texts.php b/lang/et/texts.php
index 64799000bd..51b7b2632f 100644
--- a/lang/et/texts.php
+++ b/lang/et/texts.php
@@ -1100,7 +1100,7 @@ $lang = array(
     'invoice_embed_documents' => 'Manusta dokumendid',
     'invoice_embed_documents_help' => 'Lisage arvele lisatud pildid.',
     'document_email_attachment' => 'Lisa dokumendid',
-    'ubl_email_attachment' => 'Lisa UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Laadi alla dokumendid (:size)',
     'documents_from_expenses' => 'Kuludest:',
     'dropzone_default_message' => 'Asetage failid või klõpsake üleslaadimiseks',
@@ -3045,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Portaali režiim',
     'attach_pdf' => 'Lisage PDF',
     'attach_documents' => 'Lisage dokumendid',
-    'attach_ubl' => 'Kinnitage UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Meili stiil',
     'processed' => 'Processed',
     'fee_amount' => 'Viivise summa',
diff --git a/lang/fa/texts.php b/lang/fa/texts.php
index 6e8601a351..53a4a5108f 100644
--- a/lang/fa/texts.php
+++ b/lang/fa/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Attach Documents',
-    'ubl_email_attachment' => 'Attach UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Download Documents (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -2364,7 +2364,7 @@ $lang = array(
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'writing a review',
@@ -2880,19 +2880,6 @@ $lang = array(
     'refunded' => 'Refunded',
     'marked_quote_as_sent' => 'Successfully marked quote as sent',
     'custom_module_settings' => 'Custom Module Settings',
-    'ticket' => 'Ticket',
-    'tickets' => 'Tickets',
-    'ticket_number' => 'Ticket #',
-    'new_ticket' => 'New Ticket',
-    'edit_ticket' => 'Edit Ticket',
-    'view_ticket' => 'View Ticket',
-    'archive_ticket' => 'Archive Ticket',
-    'restore_ticket' => 'Restore Ticket',
-    'delete_ticket' => 'Delete Ticket',
-    'archived_ticket' => 'Successfully archived ticket',
-    'archived_tickets' => 'Successfully archived tickets',
-    'restored_ticket' => 'Successfully restored ticket',
-    'deleted_ticket' => 'Successfully deleted ticket',
     'open' => 'Open',
     'new' => 'New',
     'closed' => 'Closed',
@@ -2909,14 +2896,6 @@ $lang = array(
     'assigned_to' => 'Assigned to',
     'reply' => 'Reply',
     'awaiting_reply' => 'Awaiting reply',
-    'ticket_close' => 'Close Ticket',
-    'ticket_reopen' => 'Reopen Ticket',
-    'ticket_open' => 'Open Ticket',
-    'ticket_split' => 'Split Ticket',
-    'ticket_merge' => 'Merge Ticket',
-    'ticket_update' => 'Update Ticket',
-    'ticket_settings' => 'Ticket Settings',
-    'updated_ticket' => 'Ticket Updated',
     'mark_spam' => 'Mark as Spam',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Name taken',
@@ -2934,31 +2913,23 @@ $lang = array(
     'mime_types' => 'Mime types',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Comma separated list of allowed mime types, leave blank for all',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Default priority',
     'alert_new_comment_id' => 'New comment',
-    'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
-    'alert_comment_ticket_email_help' => 'Comma separated emails to bcc on new comment.',
-    'new_ticket_notification_list' => 'Additional new ticket notifications',
     'update_ticket_notification_list' => 'Additional new comment notifications',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Ticket assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting a template will send a notification (to agent) when a ticket is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Additional ticket assigned notifications',
-    'alert_ticket_assign_agent_id_help' => 'Comma separated emails to bcc on ticket assignment.',
-    'alert_ticket_transfer_email_help' => 'Comma separated emails to bcc on ticket transfer.',
-    'alert_ticket_overdue_agent_id' => 'Ticket overdue',
-    'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
-    'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
     'default_agent' => 'Default Agent',
     'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
     'show_agent_details' => 'Show agent details on responses',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'Ticket not found',
     'add_template' => 'Add Template',
-    'updated_ticket_template' => 'Updated Ticket Template',
-    'created_ticket_template' => 'Created Ticket Template',
     'archive_ticket_template' => 'Archive Template',
     'restore_ticket_template' => 'Restore Template',
     'archived_ticket_template' => 'Successfully archived template',
@@ -3074,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Attach PDF',
     'attach_documents' => 'Attach Documents',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
@@ -3815,7 +3786,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5303,6 +5274,33 @@ $lang = array(
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/fi/texts.php b/lang/fi/texts.php
index d23e9dc367..a8fe5fa26f 100644
--- a/lang/fi/texts.php
+++ b/lang/fi/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Sisällytä liitetyt kuvat laskuun.',
     'document_email_attachment' => 'Liitä Dokumentit',
-    'ubl_email_attachment' => 'Liitä UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Lataa asiakirjat (:koko)',
     'documents_from_expenses' => 'Kuluista:',
     'dropzone_default_message' => 'Pudota tiedostot tai napsauta ladataksesi palvelimelle',
@@ -2364,7 +2364,7 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'We hope you\'re enjoying using  app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'writing  review',
@@ -2880,19 +2880,6 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'refunded' => 'Refunded',
     'marked_quote_as_sent' => 'Tarjous on onnistuneesti merkitty lähetetyksi',
     'custom_module_settings' => 'muokattu Module asetukset',
-    'ticket' => 'tiketti',
-    'tickets' => 'Tickets',
-    'ticket_number' => 'tiketti #',
-    'new_ticket' => 'uusi tiketti',
-    'edit_ticket' => 'muokkaa tiketti',
-    'view_ticket' => 'Näytä Tiketti',
-    'archive_ticket' => 'Arkistoi tiketti',
-    'restore_ticket' => 'palauta tiketti',
-    'delete_ticket' => 'Poista tiketti',
-    'archived_ticket' => 'onnistuneesti arkistoitu tiketti',
-    'archived_tickets' => 'onnistuneesti arkistoitu tiketit',
-    'restored_ticket' => 'onnistuneesti palautettu tiketti',
-    'deleted_ticket' => 'onnistuneesti poistettu tiketti',
     'open' => 'avaa',
     'new' => 'uusi',
     'closed' => 'suljettu',
@@ -2909,14 +2896,6 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'assigned_to' => 'Assigned  ',
     'reply' => 'Reply',
     'awaiting_reply' => 'Awaiting vastaus',
-    'ticket_close' => 'sulje tiketti',
-    'ticket_reopen' => 'Reopen tiketti',
-    'ticket_open' => 'avaa tiketti',
-    'ticket_split' => 'Split tiketti',
-    'ticket_merge' => 'Merge tiketti',
-    'ticket_update' => 'päivitä tiketti',
-    'ticket_settings' => 'tiketti asetukset',
-    'updated_ticket' => 'tiketti päivitetty',
     'mark_spam' => 'Merkitse roskapostiksi',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'nimi taken',
@@ -2934,31 +2913,23 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'mime_types' => 'Mime types',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Pilkulla erotettu lista  allowed mime types, jätä tyhjäksi  kaikki',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'oletus priority',
     'alert_new_comment_id' => 'uusi comment',
-    'alert_comment_ticket_help' => 'Selecting  template will send  notification ( agent) when  comment is made.',
-    'alert_comment_ticket_email_help' => 'pilkulla erotetut sähköpostit  bcc on uusi comment.',
-    'new_ticket_notification_list' => 'Täydentävät Uusi tiketti -ilmoitukset',
     'update_ticket_notification_list' => 'Täydentävät Uusi kommentti -ilmoitukset',
     'comma_separated_values' => 'admin@esimerkki.com, supervisor@esimerkki.com',
-    'alert_ticket_assign_agent_id' => 'tiketti assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting  template will send  notification ( agent) when  tiketti is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Täydentävät Uusi tiketin kohdennus -ilmoitukset',
-    'alert_ticket_assign_agent_id_help' => 'pilkulla erotetut sähköpostit  bcc on tiketti assignment.',
-    'alert_ticket_transfer_email_help' => 'pilkulla erotetut sähköpostit  bcc on tiketti transfer.',
-    'alert_ticket_overdue_agent_id' => 'tiketti overdue',
-    'alert_ticket_overdue_email' => 'Täydentävät Uusi tiketti yliajalla -ilmoitukset',
-    'alert_ticket_overdue_email_help' => 'pilkulla erotetut sähköpostit  bcc on tiketti overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting  template will send  notification ( agent) when  tiketti becomes overdue.',
     'default_agent' => 'oletus Agent',
     'default_agent_help' => 'If selected will automatically be assigned  kaikki inbound tiketit',
     'show_agent_details' => 'Näytä agentin tiedot vastauksissa',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'tiketti ei löydy',
     'add_template' => 'Lisää mallipohja',
-    'updated_ticket_template' => 'päivitetty tiketti pohja',
-    'created_ticket_template' => 'luotu tiketti pohja',
     'archive_ticket_template' => 'Arkistoi pohja',
     'restore_ticket_template' => 'palauta pohja',
     'archived_ticket_template' => 'onnistuneesti arkistoitu template',
@@ -3074,7 +3045,7 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Liitä PDF',
     'attach_documents' => 'Liitä asiakirjoja',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'palkkio määrä',
@@ -3815,7 +3786,7 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5303,6 +5274,33 @@ Kun saat summat, palaa tälle maksutapasivulle ja klikkaa "Saata loppuun todenta
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/fr/texts.php b/lang/fr/texts.php
index 4e3cd81334..dca688d385 100644
--- a/lang/fr/texts.php
+++ b/lang/fr/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documents intégrés',
     'invoice_embed_documents_help' => 'Inclure l\'image attachée dans la facture.',
     'document_email_attachment' => 'Attacher les documents',
-    'ubl_email_attachment' => 'Joindre UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Télécharger les Documents (:size)',
     'documents_from_expenses' => 'Des dépenses :',
     'dropzone_default_message' => 'Glisser le fichier ou cliquer pour envoyer',
@@ -3045,7 +3045,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'portal_mode' => 'Mode portail',
     'attach_pdf' => 'Joindre PDF',
     'attach_documents' => 'Joindre les Documents',
-    'attach_ubl' => 'Joindre UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Style d\'email',
     'processed' => 'Traité',
     'fee_amount' => 'Montant des frais',
diff --git a/lang/fr_CA/texts.php b/lang/fr_CA/texts.php
index 98c0f35f02..a01d6cf20c 100644
--- a/lang/fr_CA/texts.php
+++ b/lang/fr_CA/texts.php
@@ -1096,7 +1096,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documents intégrés',
     'invoice_embed_documents_help' => 'Inclure les images jointes dans la facture.',
     'document_email_attachment' => 'Joindre un document',
-    'ubl_email_attachment' => 'Joindre un UBL',
+    'ubl_email_attachment' => 'Joindre la facture UBL',
     'download_documents' => 'Télécharger les documents (:size)',
     'documents_from_expenses' => 'Des dépenses:',
     'dropzone_default_message' => 'Glissez-déposez ou cliquez pour téléverser des fichiers',
@@ -3042,7 +3042,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'portal_mode' => 'Mode portail',
     'attach_pdf' => 'Joindre un PDF',
     'attach_documents' => 'Joindre un document',
-    'attach_ubl' => 'Joindre un UBL',
+    'attach_ubl' => 'Joindre la facture UBL',
     'email_style' => 'Style de courriel',
     'processed' => 'Traité',
     'fee_amount' => 'Montant des frais',
diff --git a/lang/fr_CH/texts.php b/lang/fr_CH/texts.php
index 5173f18c35..e44ef16b8b 100644
--- a/lang/fr_CH/texts.php
+++ b/lang/fr_CH/texts.php
@@ -1096,7 +1096,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documents intégrés',
     'invoice_embed_documents_help' => 'Inclure les images jointes dans la facture.',
     'document_email_attachment' => 'Documents joints',
-    'ubl_email_attachment' => 'Joindre un UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Télécharger les documents (:size)',
     'documents_from_expenses' => 'Des dépenses:',
     'dropzone_default_message' => 'Glissez-déposez ou cliquez pour téléverser des fichiers',
@@ -3042,7 +3042,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'portal_mode' => 'Mode portail',
     'attach_pdf' => 'Joindre un PDF',
     'attach_documents' => 'Joindre un document',
-    'attach_ubl' => 'Joindre UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Style de courriel',
     'processed' => 'Traité',
     'fee_amount' => 'Montant des frais',
diff --git a/lang/he/texts.php b/lang/he/texts.php
index 89339eeaf4..efcee60b4a 100644
--- a/lang/he/texts.php
+++ b/lang/he/texts.php
@@ -1097,7 +1097,7 @@ $lang = array(
     'invoice_embed_documents' => 'מסמכים מוטמעים',
     'invoice_embed_documents_help' => 'כלול קבצים מצורפים כתמונות בחשבונית',
     'document_email_attachment' => 'צרף קובץ',
-    'ubl_email_attachment' => 'צרף URL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'הורד מסמכים  (:size)',
     'documents_from_expenses' => 'מהוצאות:',
     'dropzone_default_message' => 'גרור קבצים או לחץ להעלאה',
@@ -3043,7 +3043,7 @@ $lang = array(
     'portal_mode' => 'מצב פורטל',
     'attach_pdf' => 'צרף PDF',
     'attach_documents' => 'צרף מסמכים',
-    'attach_ubl' => 'צרף UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'סגנון אימייל',
     'processed' => 'מעובד',
     'fee_amount' => 'סכום תשלום',
diff --git a/lang/hr/texts.php b/lang/hr/texts.php
index 1407789856..d3a625f9a4 100644
--- a/lang/hr/texts.php
+++ b/lang/hr/texts.php
@@ -1100,7 +1100,7 @@ Nevažeći kontakt email',
     'invoice_embed_documents' => 'Ugrađeni dokumenti',
     'invoice_embed_documents_help' => 'Ubaci dodane dokumente u račun.',
     'document_email_attachment' => 'Dodaj dokumente',
-    'ubl_email_attachment' => 'Attach UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Preuzmi dokumente (:size)',
     'documents_from_expenses' => 'Od troškova:',
     'dropzone_default_message' => 'Ispusti dokument ili klikni za prijenos',
@@ -2365,7 +2365,7 @@ Nevažeći kontakt email',
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'writing a review',
@@ -2881,19 +2881,6 @@ Nevažeći kontakt email',
     'refunded' => 'Povrat',
     'marked_quote_as_sent' => 'Ponuda je uspješno označena kao poslana',
     'custom_module_settings' => 'Postavke prilagođenog modula',
-    'ticket' => 'Radni nalog',
-    'tickets' => 'Radni nalozi',
-    'ticket_number' => 'Radni nalog #',
-    'new_ticket' => 'Novi radni nalog',
-    'edit_ticket' => 'Uredi radni nalog',
-    'view_ticket' => 'Pregledaj radni nalog',
-    'archive_ticket' => 'Arhiviraj radni nalog ',
-    'restore_ticket' => 'Vrati radni nalog',
-    'delete_ticket' => 'Izbriši radni nalog',
-    'archived_ticket' => 'Uspješno arhiviran radni nalog',
-    'archived_tickets' => 'Uspješno arhivirani radni nalozi',
-    'restored_ticket' => 'Uspješno vraćen radni nalog',
-    'deleted_ticket' => 'Uspješno izbrisani radni nalog',
     'open' => 'Otvori',
     'new' => 'Novi',
     'closed' => 'Zatvoren',
@@ -2910,14 +2897,6 @@ Nevažeći kontakt email',
     'assigned_to' => 'Dodijeljeno za',
     'reply' => 'Odgovori',
     'awaiting_reply' => 'Čeka odgovor',
-    'ticket_close' => 'Zatvori radni nalog',
-    'ticket_reopen' => 'Ponovno otvori radni nalog',
-    'ticket_open' => 'Otvori radni nalog',
-    'ticket_split' => 'Razdvoji radni nalog',
-    'ticket_merge' => 'Spoji radni nalog',
-    'ticket_update' => 'Ažuriraj radni nalog',
-    'ticket_settings' => 'Postavke radnog naloga',
-    'updated_ticket' => 'Radni nalog ažuriran',
     'mark_spam' => 'Označi kao Spam',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Ime je zauzeto',
@@ -2935,31 +2914,23 @@ Nevažeći kontakt email',
     'mime_types' => 'MIME tipovi',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Popis dopuštenih vrsta MIME tipova, odvojeni zarezima. Za sve, ostavite prazno',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Zadani prioritet',
     'alert_new_comment_id' => 'Novi komentar',
-    'alert_comment_ticket_help' => 'Odabirom predloška poslat će se obavijest (agentu) kad se kreira komentar.',
-    'alert_comment_ticket_email_help' => 'E-adrese odvojene zarezom na koje će se poslati skrivena kopija novog komentara.',
-    'new_ticket_notification_list' => 'Dodatne obavijesti novog radnog naloga',
     'update_ticket_notification_list' => 'Dodatne obavijesti novog komentara ',
     'comma_separated_values' => 'admin@primjer.hr, korisnik@primjer.hr',
-    'alert_ticket_assign_agent_id' => 'Dodjela radnog naloga',
-    'alert_ticket_assign_agent_id_hel' => 'Odabirom predloška, obavijesti će biti poslana (agentu) kada je radni nalog dodijeljen.',
-    'alert_ticket_assign_agent_id_notifications' => 'Dodatne obavijesti dodijeljenog radnog naloga',
-    'alert_ticket_assign_agent_id_help' => 'E-adrese odvojene zarezom na koje će se poslati skrivena kopija obavijesti dodjele radnog naloga.',
-    'alert_ticket_transfer_email_help' => 'E-adrese odvojene zarezom na koje će se poslati skrivena kopija prijenosa radnog naloga.',
-    'alert_ticket_overdue_agent_id' => 'Randi nalog kasni',
-    'alert_ticket_overdue_email' => 'Dodatne obavijesti o kašnjenju radnog naloga',
-    'alert_ticket_overdue_email_help' => 'E-adrese odvojene zarezom na koje će se poslati skrivena kopija kašnjenja radnog naloga.',
-    'alert_ticket_overdue_agent_id_help' => 'Odabirom predloška, obavijesti će biti poslana (agentu) kada je radni nalog kasni.',
     'default_agent' => 'Zadani agent',
     'default_agent_help' => 'Ako se odabere, automatski će se dodijeliti svim ulaznim radnim nalozima',
     'show_agent_details' => 'Prikaži detalje agenta u odgovorima',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Ukloni Avatar',
-    'ticket_not_found' => 'Radni nalog nije pronađen',
     'add_template' => 'Dodaj Predložak',
-    'updated_ticket_template' => 'Ažuriran predložak radnog naloga',
-    'created_ticket_template' => 'Kreirani predložak radnog naloga',
     'archive_ticket_template' => 'Arhiviran predložak ranog naloga',
     'restore_ticket_template' => 'Vrati predložak radnog naloga',
     'archived_ticket_template' => 'Predložak uspješno arhiviran',
@@ -3075,7 +3046,7 @@ Nevažeći kontakt email',
     'portal_mode' => 'Način rada Portal',
     'attach_pdf' => 'Priložite PDF',
     'attach_documents' => 'Priložite dokumente',
-    'attach_ubl' => 'Priložite UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Stil e-pošte',
     'processed' => 'Obrađeno',
     'fee_amount' => 'Iznos naknade',
@@ -3816,7 +3787,7 @@ Nevažeći kontakt email',
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5304,6 +5275,33 @@ Nevažeći kontakt email',
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/hu/texts.php b/lang/hu/texts.php
index 0a38eb4fcd..b10b6b8f24 100644
--- a/lang/hu/texts.php
+++ b/lang/hu/texts.php
@@ -1080,7 +1080,7 @@ $lang = array(
     'invoice_embed_documents' => 'Dokumentumok beágyazása',
     'invoice_embed_documents_help' => 'Csatolja a dokumentumokat a PDF-hez',
     'document_email_attachment' => 'Dokumentumok csatolása',
-    'ubl_email_attachment' => 'UBL csatolás',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Dokumentumok letöltése',
     'documents_from_expenses' => 'Költségek dokumentumai:',
     'dropzone_default_message' => 'Húzza ide a fájlokat vagy kattintson ide a feltöltéshez',
@@ -3029,7 +3029,7 @@ adva :date',
     'portal_mode' => 'Portál mód',
     'attach_pdf' => 'PDF csatolása',
     'attach_documents' => 'Dokumentumok csatolása',
-    'attach_ubl' => 'UBL csatolása',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'E-mail stílusa',
     'processed' => 'Feldolgozott',
     'fee_amount' => 'Díj összege',
diff --git a/lang/it/texts.php b/lang/it/texts.php
index 8269e81e73..9e33a16410 100644
--- a/lang/it/texts.php
+++ b/lang/it/texts.php
@@ -1087,7 +1087,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Includi immagini allegate alla fattura.',
     'document_email_attachment' => 'Allega Documenti',
-    'ubl_email_attachment' => 'Allega UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Scarica Documenti (:size)',
     'documents_from_expenses' => 'Da spese:',
     'dropzone_default_message' => 'Trascina file o clicca per caricare',
@@ -3036,7 +3036,7 @@ $lang = array(
     'portal_mode' => 'Modalità portale',
     'attach_pdf' => 'Allega PDF',
     'attach_documents' => 'Allega documenti',
-    'attach_ubl' => 'Allega UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Stile Email',
     'processed' => 'Processato',
     'fee_amount' => 'Importo della tassa',
diff --git a/lang/km_KH/texts.php b/lang/km_KH/texts.php
index 11f88eb3c3..2e570008e5 100644
--- a/lang/km_KH/texts.php
+++ b/lang/km_KH/texts.php
@@ -1080,7 +1080,7 @@ $lang = array(
     'invoice_embed_documents' => 'ឯកសារបង្កប់',
     'invoice_embed_documents_help' => 'រួមបញ្ចូលរូបភាពដែលបានភ្ជាប់នៅក្នុងវិក្កយបត្រ។',
     'document_email_attachment' => 'ភ្ជាប់ឯកសារ',
-    'ubl_email_attachment' => 'ភ្ជាប់ UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'ទាញយកសំណុំទិន្នន័យ (:size)',
     'documents_from_expenses' => 'ពីការចំណាយ៖',
     'dropzone_default_message' => 'ទម្លាក់ឯកសារ ឬចុចដើម្បីផ្ទុកឡើង',
@@ -3025,7 +3025,7 @@ $lang = array(
     'portal_mode' => 'របៀបវិបផតថល។',
     'attach_pdf' => 'ភ្ជាប់ PDF',
     'attach_documents' => 'ភ្ជាប់ឯកសារ',
-    'attach_ubl' => 'ភ្ជាប់ UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'រចនាប័ទ្មអ៊ីមែល',
     'processed' => 'ដំណើរការ',
     'fee_amount' => 'ចំនួនទឹកប្រាក់ថ្លៃសេវា',
diff --git a/lang/lo_LA/texts.php b/lang/lo_LA/texts.php
index 90b6ef3d9b..3677f99b38 100644
--- a/lang/lo_LA/texts.php
+++ b/lang/lo_LA/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'ຝັງເອກະສານ',
     'invoice_embed_documents_help' => 'ລວມເອົາຮູບທີ່ຕິດຢູ່ໃນໃບແຈ້ງໜີ້.',
     'document_email_attachment' => 'ແນບເອກະສານ',
-    'ubl_email_attachment' => 'ຕິດ UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'ດາວໂຫລດເອກະສານ (:size)',
     'documents_from_expenses' => 'ຈາກຄ່າໃຊ້ຈ່າຍ:',
     'dropzone_default_message' => 'ວາງໄຟລ໌ຫຼືຄລິກເພື່ອອັບໂຫລດ',
@@ -3045,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'ໂໝດປະຕູ',
     'attach_pdf' => 'ແນບ PDF',
     'attach_documents' => 'ແນບເອກະສານ',
-    'attach_ubl' => 'ຕິດ UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'ຮູບແບບອີເມວ',
     'processed' => 'ປະມວນຜົນແລ້ວ',
     'fee_amount' => 'ຈໍານວນຄ່າທໍານຽມ',
diff --git a/lang/lv_LV/texts.php b/lang/lv_LV/texts.php
index 8cabdf50d2..33a7f42a17 100644
--- a/lang/lv_LV/texts.php
+++ b/lang/lv_LV/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Attach Documents',
-    'ubl_email_attachment' => 'Attach UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Download Documents (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -2364,7 +2364,7 @@ $lang = array(
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'writing a review',
@@ -2880,19 +2880,6 @@ $lang = array(
     'refunded' => 'Atgriezts',
     'marked_quote_as_sent' => 'Cenu piedāvājums veiksmīgi atzīmēts kā nosūtīts',
     'custom_module_settings' => 'Custom Module Settings',
-    'ticket' => 'Biļete',
-    'tickets' => 'Biļetes',
-    'ticket_number' => 'Biļetes #',
-    'new_ticket' => 'Jaunā biļete',
-    'edit_ticket' => 'Edit Ticket',
-    'view_ticket' => 'View Ticket',
-    'archive_ticket' => 'Archive Ticket',
-    'restore_ticket' => 'Restore Ticket',
-    'delete_ticket' => 'Delete Ticket',
-    'archived_ticket' => 'Successfully archived ticket',
-    'archived_tickets' => 'Successfully archived tickets',
-    'restored_ticket' => 'Successfully restored ticket',
-    'deleted_ticket' => 'Successfully deleted ticket',
     'open' => 'Atvērt',
     'new' => 'Jauns',
     'closed' => 'Closed',
@@ -2909,14 +2896,6 @@ $lang = array(
     'assigned_to' => 'Assigned to',
     'reply' => 'Atbildēt',
     'awaiting_reply' => 'Awaiting reply',
-    'ticket_close' => 'Close Ticket',
-    'ticket_reopen' => 'Reopen Ticket',
-    'ticket_open' => 'Open Ticket',
-    'ticket_split' => 'Split Ticket',
-    'ticket_merge' => 'Merge Ticket',
-    'ticket_update' => 'Update Ticket',
-    'ticket_settings' => 'Ticket Settings',
-    'updated_ticket' => 'Ticket Updated',
     'mark_spam' => 'Mark as Spam',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Name taken',
@@ -2934,31 +2913,23 @@ $lang = array(
     'mime_types' => 'Mime types',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Comma separated list of allowed mime types, leave blank for all',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Default priority',
     'alert_new_comment_id' => 'Jauns komentārs',
-    'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
-    'alert_comment_ticket_email_help' => 'Comma separated emails to bcc on new comment.',
-    'new_ticket_notification_list' => 'Additional new ticket notifications',
     'update_ticket_notification_list' => 'Additional new comment notifications',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Ticket assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting a template will send a notification (to agent) when a ticket is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Additional ticket assigned notifications',
-    'alert_ticket_assign_agent_id_help' => 'Comma separated emails to bcc on ticket assignment.',
-    'alert_ticket_transfer_email_help' => 'Comma separated emails to bcc on ticket transfer.',
-    'alert_ticket_overdue_agent_id' => 'Ticket overdue',
-    'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
-    'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
     'default_agent' => 'Default Agent',
     'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
     'show_agent_details' => 'Show agent details on responses',
     'avatar' => 'Avatārs',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'Ticket not found',
     'add_template' => 'Add Template',
-    'updated_ticket_template' => 'Updated Ticket Template',
-    'created_ticket_template' => 'Created Ticket Template',
     'archive_ticket_template' => 'Archive Template',
     'restore_ticket_template' => 'Restore Template',
     'archived_ticket_template' => 'Successfully archived template',
@@ -3074,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Attach PDF',
     'attach_documents' => 'Attach Documents',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
@@ -3815,7 +3786,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5303,6 +5274,33 @@ $lang = array(
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/mk_MK/texts.php b/lang/mk_MK/texts.php
index b72e2dac8e..25a5dc94b3 100644
--- a/lang/mk_MK/texts.php
+++ b/lang/mk_MK/texts.php
@@ -1100,7 +1100,7 @@ $lang = array(
     'invoice_embed_documents' => 'Вметни документи',
     'invoice_embed_documents_help' => 'Вклучи ги прикачените слики во фактурата.',
     'document_email_attachment' => 'Прикачи документи',
-    'ubl_email_attachment' => 'Прикачи UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Преземи документи (:size)',
     'documents_from_expenses' => 'Од Трошоци:',
     'dropzone_default_message' => 'Спушти ги датотеките или кликни за да прикачување',
@@ -2365,7 +2365,7 @@ $lang = array(
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'Се надеваме дека уживате во користењето на апликацијата. <br/> Ако го земете во предвид :link многу би ни значело!',
     'writing_a_review' => 'пишување рецензија',
@@ -2881,19 +2881,6 @@ $lang = array(
     'refunded' => 'Refunded',
     'marked_quote_as_sent' => 'Successfully marked quote as sent',
     'custom_module_settings' => 'Custom Module Settings',
-    'ticket' => 'Ticket',
-    'tickets' => 'Tickets',
-    'ticket_number' => 'Ticket #',
-    'new_ticket' => 'New Ticket',
-    'edit_ticket' => 'Edit Ticket',
-    'view_ticket' => 'View Ticket',
-    'archive_ticket' => 'Archive Ticket',
-    'restore_ticket' => 'Restore Ticket',
-    'delete_ticket' => 'Delete Ticket',
-    'archived_ticket' => 'Successfully archived ticket',
-    'archived_tickets' => 'Successfully archived tickets',
-    'restored_ticket' => 'Successfully restored ticket',
-    'deleted_ticket' => 'Successfully deleted ticket',
     'open' => 'Open',
     'new' => 'New',
     'closed' => 'Closed',
@@ -2910,14 +2897,6 @@ $lang = array(
     'assigned_to' => 'Assigned to',
     'reply' => 'Reply',
     'awaiting_reply' => 'Awaiting reply',
-    'ticket_close' => 'Close Ticket',
-    'ticket_reopen' => 'Reopen Ticket',
-    'ticket_open' => 'Open Ticket',
-    'ticket_split' => 'Split Ticket',
-    'ticket_merge' => 'Merge Ticket',
-    'ticket_update' => 'Update Ticket',
-    'ticket_settings' => 'Ticket Settings',
-    'updated_ticket' => 'Ticket Updated',
     'mark_spam' => 'Mark as Spam',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Name taken',
@@ -2935,31 +2914,23 @@ $lang = array(
     'mime_types' => 'Mime types',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Comma separated list of allowed mime types, leave blank for all',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Default priority',
     'alert_new_comment_id' => 'New comment',
-    'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
-    'alert_comment_ticket_email_help' => 'Comma separated emails to bcc on new comment.',
-    'new_ticket_notification_list' => 'Additional new ticket notifications',
     'update_ticket_notification_list' => 'Additional new comment notifications',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Ticket assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting a template will send a notification (to agent) when a ticket is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Additional ticket assigned notifications',
-    'alert_ticket_assign_agent_id_help' => 'Comma separated emails to bcc on ticket assignment.',
-    'alert_ticket_transfer_email_help' => 'Comma separated emails to bcc on ticket transfer.',
-    'alert_ticket_overdue_agent_id' => 'Ticket overdue',
-    'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
-    'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
     'default_agent' => 'Default Agent',
     'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
     'show_agent_details' => 'Show agent details on responses',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'Ticket not found',
     'add_template' => 'Add Template',
-    'updated_ticket_template' => 'Updated Ticket Template',
-    'created_ticket_template' => 'Created Ticket Template',
     'archive_ticket_template' => 'Archive Template',
     'restore_ticket_template' => 'Restore Template',
     'archived_ticket_template' => 'Successfully archived template',
@@ -3075,7 +3046,7 @@ $lang = array(
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Attach PDF',
     'attach_documents' => 'Attach Documents',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
@@ -3816,7 +3787,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5304,6 +5275,33 @@ $lang = array(
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/nl/texts.php b/lang/nl/texts.php
index 23e040a598..37700fdaba 100644
--- a/lang/nl/texts.php
+++ b/lang/nl/texts.php
@@ -1096,7 +1096,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documenten invoegen',
     'invoice_embed_documents_help' => 'Bijgevoegde afbeeldingen weergeven in de factuur.',
     'document_email_attachment' => 'Documenten bijvoegen',
-    'ubl_email_attachment' => 'Voeg UBL toe',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Documenten downloaden (:size)',
     'documents_from_expenses' => 'Van uitgaven:',
     'dropzone_default_message' => 'Sleep bestanden hierheen of klik om te uploaden',
@@ -3042,7 +3042,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'portal_mode' => 'portaalmodus',
     'attach_pdf' => 'PDF bijvoegen',
     'attach_documents' => 'Document bijvoegen',
-    'attach_ubl' => 'UBL bijvoegen',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email opmaak',
     'processed' => 'Verwerkt',
     'fee_amount' => 'Vergoedingsbedrag',
diff --git a/lang/pl/texts.php b/lang/pl/texts.php
index 2c23cad8b9..b6b4b4f4c0 100644
--- a/lang/pl/texts.php
+++ b/lang/pl/texts.php
@@ -1097,7 +1097,7 @@ Przykłady dynamicznych zmiennych:
     'invoice_embed_documents' => 'Załączniki',
     'invoice_embed_documents_help' => 'Wstaw do faktury załączniki graficzne.',
     'document_email_attachment' => 'Załącz dokumenty',
-    'ubl_email_attachment' => 'Dodaj UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Ściągnij dokumenty (:size)',
     'documents_from_expenses' => 'From Expenses:',
     'dropzone_default_message' => 'Upuść pliki lub kliknij, aby przesłać',
@@ -3043,7 +3043,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'portal_mode' => 'Tryb portalu',
     'attach_pdf' => 'Załącz PDF',
     'attach_documents' => 'Załącz dokumenty',
-    'attach_ubl' => 'Załącz UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Styl wiadomości Email',
     'processed' => 'Przetworzony',
     'fee_amount' => 'Do zapłaty',
diff --git a/lang/pt_BR/texts.php b/lang/pt_BR/texts.php
index 3f9048846f..1422bd891c 100644
--- a/lang/pt_BR/texts.php
+++ b/lang/pt_BR/texts.php
@@ -1096,7 +1096,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embutir Documentos',
     'invoice_embed_documents_help' => 'Incluir imagens anexas na fatura.',
     'document_email_attachment' => 'Anexar Documentos',
-    'ubl_email_attachment' => 'Anexar UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Baixar Documentos (:size)',
     'documents_from_expenses' => 'De Despesas:',
     'dropzone_default_message' => 'Solte arquivos ou clique para fazer upload',
@@ -1646,7 +1646,7 @@ Quando tiver as quantias, volte a esta página de formas de pagamento e clique "
     'country_Turkey' => 'Turquia',
     'country_Turkmenistan' => 'Turcomenistão',
     'country_Turks and Caicos Islands' => 'Ilhas Turks e Caicos',
-    'country_Tuvalu' => ' Tuvalu',
+    'country_Tuvalu' => 'Tuvalu',
     'country_Uganda' => 'Uganda',
     'country_Ukraine' => 'Ucrânia',
     'country_Macedonia, the former Yugoslav Republic of' => 'Macedônia, antiga República Iugoslava',
@@ -3042,7 +3042,7 @@ Quando tiver as quantias, volte a esta página de formas de pagamento e clique "
     'portal_mode' => 'Modo Portal',
     'attach_pdf' => 'Anexar PDF',
     'attach_documents' => 'Anexar Documentos',
-    'attach_ubl' => 'Anexar UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Estilo do E-mail',
     'processed' => 'Processado',
     'fee_amount' => 'Valor da Multa',
diff --git a/lang/pt_PT/texts.php b/lang/pt_PT/texts.php
index af121f6a2f..aa80e867fa 100644
--- a/lang/pt_PT/texts.php
+++ b/lang/pt_PT/texts.php
@@ -1096,7 +1096,7 @@ $lang = array(
     'invoice_embed_documents' => 'Documentos Incorporados',
     'invoice_embed_documents_help' => 'Incluir imagens anexadas na nota de pagamento.',
     'document_email_attachment' => 'Anexar Documentos',
-    'ubl_email_attachment' => 'Anexar UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Transferir Documentos (:size)',
     'documents_from_expenses' => 'De despesas:',
     'dropzone_default_message' => 'Arrastar ficheiros ou faça carregar',
@@ -3044,7 +3044,7 @@ debitar da sua conta de acordo com essas instruções. Está elegível a um reem
     'portal_mode' => 'Modo Portal',
     'attach_pdf' => 'Anexar PDF',
     'attach_documents' => 'Anexar Documentos',
-    'attach_ubl' => 'Anexar UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Estilo de e-mails',
     'processed' => 'Processado',
     'fee_amount' => 'Quantia da Taxa',
diff --git a/lang/ro/texts.php b/lang/ro/texts.php
index 7009c2fbda..3b76e0448b 100644
--- a/lang/ro/texts.php
+++ b/lang/ro/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Încorporați documentele',
     'invoice_embed_documents_help' => 'Includeți o imagine atașată facturii.',
     'document_email_attachment' => 'Atașați documente',
-    'ubl_email_attachment' => 'Atașați UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Descărcați documente (:size)',
     'documents_from_expenses' => 'Din cheltuieli:',
     'dropzone_default_message' => 'Plasați fișierele sau apăsați pentru încărcare',
@@ -3046,7 +3046,7 @@ Odată ce sumele au ajuns la dumneavoastră, reveniți la pagina cu metode de pl
     'portal_mode' => 'Mod portal',
     'attach_pdf' => 'Atașați un PDF',
     'attach_documents' => 'Atașați documente',
-    'attach_ubl' => 'Atașați UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Stil email',
     'processed' => 'Procesat',
     'fee_amount' => 'Sumă taxă',
diff --git a/lang/sk/texts.php b/lang/sk/texts.php
index 99c3c792dc..359311444d 100644
--- a/lang/sk/texts.php
+++ b/lang/sk/texts.php
@@ -1087,7 +1087,7 @@ $lang = array(
     'invoice_embed_documents' => 'Zapracovať dokumenty',
     'invoice_embed_documents_help' => 'Zahrnúť priložené obrázky do faktúry.',
     'document_email_attachment' => 'Prilož dokumenty',
-    'ubl_email_attachment' => 'Prilož UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Stiahnuť dokumenty (:size)',
     'documents_from_expenses' => 'Z výdavkov:',
     'dropzone_default_message' => 'Vložte súbory, alebo kliknite pre nahrávanie',
@@ -3032,7 +3032,7 @@ $lang = array(
     'portal_mode' => 'Režim portálu',
     'attach_pdf' => 'Priložiť PDF',
     'attach_documents' => 'Priložiť dokumenty',
-    'attach_ubl' => 'Pripojte URL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Štýl e-mailu',
     'processed' => 'Spracované',
     'fee_amount' => 'Výška poplatku',
diff --git a/lang/sl/texts.php b/lang/sl/texts.php
index f818a5ca1d..dd57ebfa52 100644
--- a/lang/sl/texts.php
+++ b/lang/sl/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Omogočeni dokumenti',
     'invoice_embed_documents_help' => 'V računu vključi pripete slike.',
     'document_email_attachment' => 'Pripni dokumente',
-    'ubl_email_attachment' => 'Pripni UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Prenesi dokumente (:size)',
     'documents_from_expenses' => 'Od stroškov:',
     'dropzone_default_message' => 'Odložite datoteke ali kliknite tukaj',
@@ -2365,7 +2365,7 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'Upamo da uživate v uporabi aplikacije.<br/>Zelo bi cenili klik na :link!',
     'writing_a_review' => 'pisanje pregleda (kritike)',
@@ -2881,19 +2881,6 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'refunded' => 'Povrjeno',
     'marked_quote_as_sent' => 'Predračun označen kot poslan',
     'custom_module_settings' => 'Nastavitve modla po meri',
-    'ticket' => 'Podporni zahtevek',
-    'tickets' => 'Podporni zahtevki',
-    'ticket_number' => 'Podporni zahtevek #',
-    'new_ticket' => 'Novi podporni zahtevek',
-    'edit_ticket' => 'Uredi podproni zahtevek',
-    'view_ticket' => 'Pregled podpornih zahtevkov',
-    'archive_ticket' => 'Arhiviraj podporni zahtevek',
-    'restore_ticket' => 'Obnovi podporni zahtevek',
-    'delete_ticket' => 'Zbriši podporni zahtevek',
-    'archived_ticket' => 'Uspešno arhiviran podporni zahtevek',
-    'archived_tickets' => 'Uspešno arhivirani podporni zahtevki',
-    'restored_ticket' => 'Uspešno obnovljen podporni zahtevek',
-    'deleted_ticket' => 'Uspešno zbrisan podproni zahtevek',
     'open' => 'Odpri',
     'new' => 'Novo',
     'closed' => 'Zaprto',
@@ -2910,14 +2897,6 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'assigned_to' => 'Dodeljeno',
     'reply' => 'Odgovori',
     'awaiting_reply' => 'Čakajoče na odgovor',
-    'ticket_close' => 'Zapri podporni zahtevek',
-    'ticket_reopen' => 'Ponovno odpri podporni zahtevek',
-    'ticket_open' => 'Odpri podporni zahtevek',
-    'ticket_split' => 'Razdeli podporni zahtevek',
-    'ticket_merge' => 'Združi podporni zahtevek',
-    'ticket_update' => 'Osveži podporni zahtevek',
-    'ticket_settings' => 'Nastavitve podpornega zahtevka',
-    'updated_ticket' => 'Podporni zahtevek je posodobljen',
     'mark_spam' => 'Označi kot nezaželjeno sporočilo',
     'local_part' => 'Lokalni del',
     'local_part_unavailable' => 'Ime je zasedeno',
@@ -2935,31 +2914,23 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'mime_types' => 'Mime types',
     'mime_types_placeholder' => '.pdf , .docx, .jpg',
     'mime_types_help' => 'Comma separated list of allowed mime types, leave blank for all',
+    'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
+    'new_ticket_template_id' => 'New ticket',
+    'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
+    'update_ticket_template_id' => 'Updated ticket',
+    'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
+    'close_ticket_template_id' => 'Closed ticket',
+    'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Default priority',
     'alert_new_comment_id' => 'New comment',
-    'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
-    'alert_comment_ticket_email_help' => 'Comma separated emails to bcc on new comment.',
-    'new_ticket_notification_list' => 'Additional new ticket notifications',
     'update_ticket_notification_list' => 'Additional new comment notifications',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Ticket assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting a template will send a notification (to agent) when a ticket is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Additional ticket assigned notifications',
-    'alert_ticket_assign_agent_id_help' => 'Comma separated emails to bcc on ticket assignment.',
-    'alert_ticket_transfer_email_help' => 'Comma separated emails to bcc on ticket transfer.',
-    'alert_ticket_overdue_agent_id' => 'Ticket overdue',
-    'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
-    'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
     'default_agent' => 'Default Agent',
     'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
     'show_agent_details' => 'Show agent details on responses',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'Ticket not found',
     'add_template' => 'Add Template',
-    'updated_ticket_template' => 'Updated Ticket Template',
-    'created_ticket_template' => 'Created Ticket Template',
     'archive_ticket_template' => 'Archive Template',
     'restore_ticket_template' => 'Restore Template',
     'archived_ticket_template' => 'Successfully archived template',
@@ -3075,7 +3046,7 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Pripni PDF',
     'attach_documents' => 'Pripni dokumente',
-    'attach_ubl' => 'Pripni UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
@@ -3816,7 +3787,7 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -5304,6 +5275,33 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
     'end_of_month' => 'End Of Month',
     'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
-return $lang;
\ No newline at end of file
+return $lang;
diff --git a/lang/sr/texts.php b/lang/sr/texts.php
index 62a764bd0b..cfbf5e8a9b 100644
--- a/lang/sr/texts.php
+++ b/lang/sr/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Priložite dokumente',
     'invoice_embed_documents_help' => 'Uključite priložene slike u fakturu.',
     'document_email_attachment' => 'Dodaj dokumente',
-    'ubl_email_attachment' => 'Dodaj UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Preuzmite dokumente (:size)',
     'documents_from_expenses' => 'Od troškova:',
     'dropzone_default_message' => 'Nalepi dokumenta ili klikni za otpremanje',
@@ -3045,7 +3045,7 @@ Kada budete imali iznose, vratite se na ovu stranicu sa načinima plaćanja i k
     'portal_mode' => 'Režim portala',
     'attach_pdf' => 'Zakači PDF',
     'attach_documents' => 'Zakači dokumenta',
-    'attach_ubl' => 'Zakači UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Stil e-pošte',
     'processed' => 'Obrađeno',
     'fee_amount' => 'Iznos takse',
diff --git a/lang/sv/texts.php b/lang/sv/texts.php
index f387edc721..d18e72d137 100644
--- a/lang/sv/texts.php
+++ b/lang/sv/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Bädda in dokument',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Bifoga dokument',
-    'ubl_email_attachment' => 'Bifoga UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Ladda ner dokument (:size)',
     'documents_from_expenses' => 'Från utgifter:',
     'dropzone_default_message' => 'Släpp filer eller klicka för att ladda upp',
@@ -3053,7 +3053,7 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'portal_mode' => 'Portal-läge',
     'attach_pdf' => 'Bifoga PDF',
     'attach_documents' => 'Bifoga dokument',
-    'attach_ubl' => 'Bifoga UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'E-poststil',
     'processed' => 'Bearbetat',
     'fee_amount' => 'Avgiftsbelopp',
diff --git a/lang/tr_TR/texts.php b/lang/tr_TR/texts.php
index 0c60986ba2..be366ea9f4 100644
--- a/lang/tr_TR/texts.php
+++ b/lang/tr_TR/texts.php
@@ -199,7 +199,7 @@ $lang = array(
     'removed_logo' => 'Logo başarıyla kaldırıldı',
     'sent_message' => 'Mesaj başarıyla gönderildi',
     'invoice_error' => 'Lütfen bir müşteri seçtiğinizden ve hataları düzelttiğinizden emin olun',
-    'limit_clients' => 'Sorry, this will exceed the limit of :count clients. Please upgrade to a paid plan.',
+    'limit_clients' => 'You\'ve hit the :count client limit on Free accounts. Congrats on your success!',
     'payment_error' => 'Ödemenizi işleme koyarken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.',
     'registration_required' => 'Registration Required',
     'confirmation_required' => 'Lütfen eposta adresinizi onaylayın. Onay epostasını tekrar göndermek için: :link',
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => 'Embed Documents',
     'invoice_embed_documents_help' => 'Include attached images in the invoice.',
     'document_email_attachment' => 'Dokümanları Ekle',
-    'ubl_email_attachment' => 'UBL Ekle',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => 'Dokümanları İndir (:size)',
     'documents_from_expenses' => 'Giderler:',
     'dropzone_default_message' => 'Drop files or click to upload',
@@ -2197,7 +2197,7 @@ $lang = array(
     'mailgun_private_key' => 'Mailgun Private Key',
     'brevo_domain' => 'Brevo Domain',
     'brevo_private_key' => 'Brevo Private Key',
-    'send_test_email' => 'Send test email',
+    'send_test_email' => 'Send Test Email',
     'select_label' => 'Select Label',
     'label' => 'Label',
     'service' => 'Service',
@@ -2364,7 +2364,7 @@ $lang = array(
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_pa_anga" => "Tongan Pa'anga",
+    "currency_tongan_paanga" => "Tongan Pa'anga",
 
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
     'writing_a_review' => 'writing a review',
@@ -2695,7 +2695,7 @@ $lang = array(
     'no_assets' => 'No images, drag to upload',
     'add_image' => 'Add Image',
     'select_image' => 'Select Image',
-    'upgrade_to_upload_images' => 'Upgrade to the Enterprise Plan to upload images',
+    'upgrade_to_upload_images' => 'Upgrade to the Enterprise Plan to upload files & images',
     'delete_image' => 'Delete Image',
     'delete_image_help' => 'Warning: deleting the image will remove it from all proposals.',
     'amount_variable_help' => 'Note: the invoice $amount field will use the partial/deposit field if set otherwise it will use the invoice balance.',
@@ -2880,19 +2880,6 @@ $lang = array(
     'refunded' => 'Refunded',
     'marked_quote_as_sent' => 'Successfully marked quote as sent',
     'custom_module_settings' => 'Custom Module Settings',
-    'ticket' => 'Ticket',
-    'tickets' => 'Tickets',
-    'ticket_number' => 'Ticket #',
-    'new_ticket' => 'New Ticket',
-    'edit_ticket' => 'Edit Ticket',
-    'view_ticket' => 'View Ticket',
-    'archive_ticket' => 'Archive Ticket',
-    'restore_ticket' => 'Restore Ticket',
-    'delete_ticket' => 'Delete Ticket',
-    'archived_ticket' => 'Successfully archived ticket',
-    'archived_tickets' => 'Successfully archived tickets',
-    'restored_ticket' => 'Successfully restored ticket',
-    'deleted_ticket' => 'Successfully deleted ticket',
     'open' => 'Open',
     'new' => 'New',
     'closed' => 'Closed',
@@ -2909,14 +2896,6 @@ $lang = array(
     'assigned_to' => 'Assigned to',
     'reply' => 'Reply',
     'awaiting_reply' => 'Awaiting reply',
-    'ticket_close' => 'Close Ticket',
-    'ticket_reopen' => 'Reopen Ticket',
-    'ticket_open' => 'Open Ticket',
-    'ticket_split' => 'Split Ticket',
-    'ticket_merge' => 'Merge Ticket',
-    'ticket_update' => 'Update Ticket',
-    'ticket_settings' => 'Ticket Settings',
-    'updated_ticket' => 'Ticket Updated',
     'mark_spam' => 'Mark as Spam',
     'local_part' => 'Local Part',
     'local_part_unavailable' => 'Name taken',
@@ -2943,66 +2922,25 @@ $lang = array(
     'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
     'default_priority' => 'Default priority',
     'alert_new_comment_id' => 'New comment',
-    'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
-    'alert_comment_ticket_email_help' => 'Comma separated emails to bcc on new comment.',
-    'new_ticket_notification_list' => 'Additional new ticket notifications',
     'update_ticket_notification_list' => 'Additional new comment notifications',
     'comma_separated_values' => 'admin@example.com, supervisor@example.com',
-    'alert_ticket_assign_agent_id' => 'Ticket assignment',
-    'alert_ticket_assign_agent_id_hel' => 'Selecting a template will send a notification (to agent) when a ticket is assigned.',
-    'alert_ticket_assign_agent_id_notifications' => 'Additional ticket assigned notifications',
-    'alert_ticket_assign_agent_id_help' => 'Comma separated emails to bcc on ticket assignment.',
-    'alert_ticket_transfer_email_help' => 'Comma separated emails to bcc on ticket transfer.',
-    'alert_ticket_overdue_agent_id' => 'Ticket overdue',
-    'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
-    'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
-    'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
-    'ticket_master' => 'Ticket Master',
-    'ticket_master_help' => 'Has the ability to assign and transfer tickets. Assigned as the default agent for all tickets.',
     'default_agent' => 'Default Agent',
     'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
     'show_agent_details' => 'Show agent details on responses',
     'avatar' => 'Avatar',
     'remove_avatar' => 'Remove avatar',
-    'ticket_not_found' => 'Ticket not found',
     'add_template' => 'Add Template',
-    'ticket_template' => 'Ticket Template',
-    'ticket_templates' => 'Ticket Templates',
-    'updated_ticket_template' => 'Updated Ticket Template',
-    'created_ticket_template' => 'Created Ticket Template',
     'archive_ticket_template' => 'Archive Template',
     'restore_ticket_template' => 'Restore Template',
     'archived_ticket_template' => 'Successfully archived template',
     'restored_ticket_template' => 'Successfully restored template',
-    'close_reason' => 'Let us know why you are closing this ticket',
-    'reopen_reason' => 'Let us know why you are reopening this ticket',
     'enter_ticket_message' => 'Please enter a message to update the ticket',
     'show_hide_all' => 'Show / Hide all',
     'subject_required' => 'Subject required',
     'mobile_refresh_warning' => 'If you\'re using the mobile app you may need to do a full refresh.',
-    'enable_proposals_for_background' => 'To upload a background image :link to enable the proposals module.',
-    'ticket_assignment' => 'Ticket :ticket_number has been assigned to :agent',
-    'ticket_contact_reply' => 'Ticket :ticket_number has been updated by client :contact',
-    'ticket_new_template_subject' => 'Ticket :ticket_number has been created.',
-    'ticket_updated_template_subject' => 'Ticket :ticket_number has been updated.',
-    'ticket_closed_template_subject' => 'Ticket :ticket_number has been closed.',
-    'ticket_overdue_template_subject' => 'Ticket :ticket_number is now overdue',
     'merge' => 'Merge',
     'merged' => 'Merged',
     'agent' => 'Agent',
-    'parent_ticket' => 'Parent Ticket',
-    'linked_tickets' => 'Linked Tickets',
-    'merge_prompt' => 'Enter ticket number to merge into',
-    'merge_from_to' => 'Ticket #:old_ticket merged into Ticket #:new_ticket',
-    'merge_closed_ticket_text' => 'Ticket #:old_ticket was closed and merged into Ticket#:new_ticket - :subject',
-    'merge_updated_ticket_text' => 'Ticket #:old_ticket was closed and merged into this ticket',
-    'merge_placeholder' => 'Merge ticket #:ticket into the following ticket',
-    'select_ticket' => 'Select Ticket',
-    'new_internal_ticket' => 'New internal ticket',
-    'internal_ticket' => 'Internal ticket',
-    'create_ticket' => 'Create ticket',
-    'allow_inbound_email_tickets_external' => 'New Tickets by email (Client)',
-    'allow_inbound_email_tickets_external_help' => 'Allow clients to create new tickets by email',
     'include_in_filter' => 'Include in filter',
     'custom_client1' => ':VALUE',
     'custom_client2' => ':VALUE',
@@ -3107,7 +3045,7 @@ $lang = array(
     'portal_mode' => 'Portal Mode',
     'attach_pdf' => 'Attach PDF',
     'attach_documents' => 'Attach Documents',
-    'attach_ubl' => 'Attach UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => 'Email Style',
     'processed' => 'Processed',
     'fee_amount' => 'Fee Amount',
@@ -3848,7 +3786,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
@@ -4029,7 +3967,7 @@ $lang = array(
     'user_detached' => 'User detached from company',
     'create_webhook_failure' => 'Failed to create Webhook',
     'payment_message_extended' => 'Thank you for your payment of :amount for :invoice',
-    'online_payments_minimum_note' => 'Note: Online payments are supported only if amount is bigger than $1 or currency equivalent.',
+    'online_payments_minimum_note' => 'Note: Online payments are supported only if amount is larger than $1 or currency equivalent.',
     'payment_token_not_found' => 'Payment token not found, please try again. If an issue still persist, try with another payment method',
     'vendor_address1' => 'Vendor Street',
     'vendor_address2' => 'Vendor Apt/Suite',
@@ -4170,7 +4108,7 @@ $lang = array(
     'one_time_purchases' => 'One time purchases',
     'recurring_purchases' => 'Recurring purchases',
     'you_might_be_interested_in_following' => 'You might be interested in the following',
-    'quotes_with_status_sent_can_be_approved' => 'Only quotes with "Sent" status can be approved.',
+    'quotes_with_status_sent_can_be_approved' => 'Only quotes with "Sent" status can be approved. Expired quotes cannot be approved.',
     'no_quotes_available_for_download' => 'No quotes available for download.',
     'copyright' => 'Copyright',
     'user_created_user' => ':user created :created_user at :time',
@@ -4437,7 +4375,7 @@ $lang = array(
     'client_shipping_country' => 'Client Shipping Country',
     'load_pdf' => 'Load PDF',
     'start_free_trial' => 'Start Free Trial',
-    'start_free_trial_message' => 'Start your FREE 14 day trial of the pro plan',
+    'start_free_trial_message' => 'Start your FREE 14 day trial of the Pro Plan',
     'due_on_receipt' => 'Due on Receipt',
     'is_paid' => 'Is Paid',
     'age_group_paid' => 'Paid',
@@ -5147,7 +5085,7 @@ $lang = array(
     'payment_refund_receipt' => 'Payment Refund Receipt # :number',
     'payment_receipt' => 'Payment Receipt # :number',
     'load_template_description' => 'The template will be applied to following:',
-    'run_template' => 'Run template',
+    'run_template' => 'Run Template',
     'statement_design' => 'Statement Design',
     'delivery_note_design' => 'Delivery Note Design',
     'payment_receipt_design' => 'Payment Receipt Design',
@@ -5277,8 +5215,6 @@ $lang = array(
     'accept_payments_online' => 'Accept Payments Online',
     'all_payment_gateways' => 'View all payment gateways',
     'product_cost' => 'Product cost',
-    'enable_rappen_roudning' => 'Enable Rappen Rounding',
-    'enable_rappen_rounding_help' => 'Rounds totals to nearest 5',
     'duration_words' => 'Duration in words',
     'upcoming_recurring_invoices' => 'Upcoming Recurring Invoices',
     'shipping_country_id' => 'Shipping Country',
@@ -5292,6 +5228,79 @@ $lang = array(
     'e_credit' => 'E-Credit',
     'e_purchase_order' => 'E-Purchase Order',
     'e_quote_type' => 'E-Quote Type',
+    'unlock_unlimited_clients' => 'Please upgrade to unlock unlimited clients!',
+    'download_e_purchase_order' => 'Download E-Purchase Order',
+    'flutter_web_warning' => 'We recommend using the new web app or the desktop app for the best performance',
+    'rappen_rounding' => 'Rappen Rounding',
+    'rappen_rounding_help' => 'Round amount to 5 cents',
+    'assign_group' => 'Assign group',
+    'paypal_advanced_cards' => 'Advanced Card Payments',
+    'local_domain_help' => 'EHLO domain (optional)',
+    'port_help' => 'ie. 25,587,465',
+    'host_help' => 'ie. smtp.gmail.com',
+    'always_show_required_fields' => 'Allows show required fields form',
+    'always_show_required_fields_help' => 'Displays the required fields form always at checkout',
+    'advanced_cards' => 'Advanced Cards',
+    'activity_140' => 'Statement sent to :client',
+    'invoice_net_amount' => 'Invoice Net Amount',
+    'round_to_minutes' => 'Round To Minutes',
+    '1_second' => '1 Second',
+    '1_minute' => '1 Minute',
+    '5_minutes' => '5 Minutes',
+    '15_minutes' => '15 Minutes',
+    '30_minutes' => '30 Minutes',
+    '1_hour' => '1 Hour',
+    '1_day' => '1 Day',
+    'round_tasks' => 'Task Rounding Direction',
+    'round_tasks_help' => 'Round task times up or down.',
+    'direction' => 'Direction',
+    'round_up' => 'Round Up',
+    'round_down' => 'Round Down',
+    'task_round_to_nearest' => 'Round To Nearest',
+    'task_round_to_nearest_help' => 'The interval to round the task to.',
+    'bulk_updated' => 'Successfully updated data',
+    'bulk_update' => 'Bulk Update',
+    'calculate' => 'Calculate',
+    'sum' => 'Sum',
+    'money' => 'Money',
+    'web_app' => 'Web App',
+    'desktop_app' => 'Desktop App',
+    'disconnected' => 'Disconnected',
+    'reconnect' => 'Reconnect',
+    'e_invoice_settings' => 'E-Invoice Settings',
+    'btcpay_refund_subject' => 'Refund of your invoice via BTCPay',
+    'btcpay_refund_body' => 'A refund intended for you has been issued. To claim it via BTCPay, please click on this link:',
+    'currency_mauritanian_ouguiya' => 'Mauritanian Ouguiya',
+    'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
+    'end_of_month' => 'End Of Month',
+    'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
+    'task_assigned_subject' => 'New task assignment [Task :task] [ :date ]',
+    'task_assigned_body' => 'You have been assigned task :task <br><br> Description: :description <br><br> Client: :client',
+    'activity_141' => 'User :user entered note: :notes',
+    'quote_reminder_subject' => 'Reminder: Quote :quote from :company',
+    'quote_reminder_message' => 'Reminder for quote :number for :amount',
+    'quote_reminder1' => 'First Quote Reminder',
+    'before_valid_until_date' => 'Before the valid until date',
+    'after_valid_until_date' => 'After the valid until date',
+    'after_quote_date' => 'After the quote date',
+    'remind_quote' => 'Remind Quote',
+    'end_of_month' => 'End Of Month',
+    'tax_currency_mismatch' => 'Tax currency is different from invoice currency',
+    'edocument_import_already_exists' => 'The invoice has already been imported on :date',
+    'before_valid_until' => 'Before the valid until',
+    'after_valid_until' => 'After the valid until',
+    'task_assigned_notification' => 'Task Assigned Notification',
+    'task_assigned_notification_help' => 'Send an email when a task is assigned',
+    'invoices_locked_end_of_month' => 'Invoices are locked at the end of the month',
+    'referral_url' => 'Referral URL',
+    'add_comment' => 'Add Comment',
+    'added_comment' => 'Successfully saved comment',
+    'tickets' => 'Tickets',
+    'assigned_group' => 'Successfully assigned group',
+    'merge_to_pdf' => 'Merge to PDF',
+    'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
+    'auto_expand_product_table_notes' => 'Automatically expand products table notes',
+    'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
 );
 
 return $lang;
diff --git a/lang/zh_TW/texts.php b/lang/zh_TW/texts.php
index 067277dc07..1e8aedae08 100644
--- a/lang/zh_TW/texts.php
+++ b/lang/zh_TW/texts.php
@@ -1099,7 +1099,7 @@ $lang = array(
     'invoice_embed_documents' => '嵌入的文件',
     'invoice_embed_documents_help' => '在發票上附加圖片。',
     'document_email_attachment' => '附加文件',
-    'ubl_email_attachment' => '附加 UBL',
+    'ubl_email_attachment' => 'Attach UBL/E-Invoice',
     'download_documents' => '下載文件 (:size)',
     'documents_from_expenses' => '從支出:',
     'dropzone_default_message' => '將檔案拖曳至此或點擊此處來上傳',
@@ -3045,7 +3045,7 @@ $lang = array(
     'portal_mode' => '入口網站模式',
     'attach_pdf' => '附加 PDF 檔案',
     'attach_documents' => '附加文件',
-    'attach_ubl' => '附加 UBL',
+    'attach_ubl' => 'Attach UBL/E-Invoice',
     'email_style' => '電子郵件樣式',
     'processed' => '處理',
     'fee_amount' => '費用金額',

From 25d366805099312e8aa6a1de880d916d9af2c9d3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Jul 2024 10:26:03 +1000
Subject: [PATCH 3/7] Fixes for null checks

---
 app/Utils/Traits/MakesReminders.php |   6 +-
 composer.lock                       | 280 ++++++++++++++--------------
 2 files changed, 144 insertions(+), 142 deletions(-)

diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php
index 119351ba4d..ca8d2b14d1 100644
--- a/app/Utils/Traits/MakesReminders.php
+++ b/app/Utils/Traits/MakesReminders.php
@@ -82,10 +82,12 @@ trait MakesReminders
 
     private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id): bool
     {
-        if(is_null($last_sent_date) || !$last_sent_date)
+        $interval = $this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id);
+
+        if(is_null($interval))
             return false;
         
-        if (Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id))) {
+        if (Carbon::now()->startOfDay()->eq($interval)) {
             return true;
         }
 
diff --git a/composer.lock b/composer.lock
index 86e7b62c01..2aae0f6766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -535,16 +535,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.316.2",
+            "version": "3.316.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "4d8caae512c3be4d59ee6d583b3f82872dde5071"
+                "reference": "e832e594b3c213760e067e15ef2739f77505e832"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4d8caae512c3be4d59ee6d583b3f82872dde5071",
-                "reference": "4d8caae512c3be4d59ee6d583b3f82872dde5071",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e832e594b3c213760e067e15ef2739f77505e832",
+                "reference": "e832e594b3c213760e067e15ef2739f77505e832",
                 "shasum": ""
             },
             "require": {
@@ -624,9 +624,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.3"
             },
-            "time": "2024-07-10T19:16:28+00:00"
+            "time": "2024-07-12T18:07:23+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2581,16 +2581,16 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.363.0",
+            "version": "v0.364.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
-                "reference": "5a0943e498e98e23dccdd98c5a3f74bc1b442053"
+                "reference": "edc08087aa3ca63d3b74f24d59f1d2caab39b5d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/5a0943e498e98e23dccdd98c5a3f74bc1b442053",
-                "reference": "5a0943e498e98e23dccdd98c5a3f74bc1b442053",
+                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/edc08087aa3ca63d3b74f24d59f1d2caab39b5d9",
+                "reference": "edc08087aa3ca63d3b74f24d59f1d2caab39b5d9",
                 "shasum": ""
             },
             "require": {
@@ -2619,9 +2619,9 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
-                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.363.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.364.0"
             },
-            "time": "2024-07-02T01:04:18+00:00"
+            "time": "2024-07-11T01:08:44+00:00"
         },
         {
             "name": "google/auth",
@@ -2685,24 +2685,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -2731,7 +2731,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -2743,7 +2743,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "graylog2/gelf-php",
@@ -2800,22 +2800,22 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a629e5b69db96eb4939c1b34114130077dd4c6fc",
+                "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2826,9 +2826,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -2906,7 +2906,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.1"
             },
             "funding": [
                 {
@@ -2922,20 +2922,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2024-07-19T16:19:57+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
                 "shasum": ""
             },
             "require": {
@@ -2943,7 +2943,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
             "extra": {
@@ -2989,7 +2989,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.0.3"
             },
             "funding": [
                 {
@@ -3005,20 +3005,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2024-07-18T10:29:17+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
             "require": {
@@ -3033,8 +3033,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -3105,7 +3105,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
             },
             "funding": [
                 {
@@ -3121,7 +3121,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2024-07-18T11:15:46+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -4610,16 +4610,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.15.0",
+            "version": "v11.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
-                "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
+                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
                 "shasum": ""
             },
             "require": {
@@ -4812,7 +4812,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-09T15:38:12+00:00"
+            "time": "2024-07-16T14:33:07+00:00"
         },
         {
             "name": "laravel/pint",
@@ -6131,16 +6131,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.5.2",
+            "version": "v3.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "636725c1f87bc7844dd80277488268db27eec1aa"
+                "reference": "b158c6386a892efc6c5e4682e682829baac1f933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/636725c1f87bc7844dd80277488268db27eec1aa",
-                "reference": "636725c1f87bc7844dd80277488268db27eec1aa",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/b158c6386a892efc6c5e4682e682829baac1f933",
+                "reference": "b158c6386a892efc6c5e4682e682829baac1f933",
                 "shasum": ""
             },
             "require": {
@@ -6195,7 +6195,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.2"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.4"
             },
             "funding": [
                 {
@@ -6203,7 +6203,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T17:22:45+00:00"
+            "time": "2024-07-15T18:27:32+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
@@ -6514,16 +6514,16 @@
         },
         {
             "name": "mollie/mollie-api-php",
-            "version": "v2.70.0",
+            "version": "v2.71.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mollie/mollie-api-php.git",
-                "reference": "a825578aba98605db3f6b6bc5b86c196276dc3f9"
+                "reference": "dff324f0621ff134fbefffa42ee511833a58578f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/a825578aba98605db3f6b6bc5b86c196276dc3f9",
-                "reference": "a825578aba98605db3f6b6bc5b86c196276dc3f9",
+                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/dff324f0621ff134fbefffa42ee511833a58578f",
+                "reference": "dff324f0621ff134fbefffa42ee511833a58578f",
                 "shasum": ""
             },
             "require": {
@@ -6600,9 +6600,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mollie/mollie-api-php/issues",
-                "source": "https://github.com/mollie/mollie-api-php/tree/v2.70.0"
+                "source": "https://github.com/mollie/mollie-api-php/tree/v2.71.0"
             },
-            "time": "2024-07-03T19:11:11+00:00"
+            "time": "2024-07-17T08:02:14+00:00"
         },
         {
             "name": "moneyphp/money",
@@ -7167,16 +7167,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.6.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "39c8ef752db6865717cc3fba63970c16f057982c"
+                "reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/39c8ef752db6865717cc3fba63970c16f057982c",
-                "reference": "39c8ef752db6865717cc3fba63970c16f057982c",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cb4374784c87d0a0294e8513a52eb63c0aff3139",
+                "reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139",
                 "shasum": ""
             },
             "require": {
@@ -7269,7 +7269,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-20T15:52:59+00:00"
+            "time": "2024-07-16T22:29:20+00:00"
         },
         {
             "name": "nette/schema",
@@ -8948,16 +8948,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -8965,13 +8965,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -9007,7 +9007,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -9019,7 +9019,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -10465,16 +10465,16 @@
         },
         {
             "name": "sentry/sentry",
-            "version": "4.8.0",
+            "version": "4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163"
+                "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3cf5778ff425a23f2d22ed41b423691d36f47163",
-                "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/61770efd8b7888e0bdd7d234f0ba67b066e47d04",
+                "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04",
                 "shasum": ""
             },
             "require": {
@@ -10538,7 +10538,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/4.8.0"
+                "source": "https://github.com/getsentry/sentry-php/tree/4.8.1"
             },
             "funding": [
                 {
@@ -10550,20 +10550,20 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-06-05T13:18:43+00:00"
+            "time": "2024-07-16T13:45:27+00:00"
         },
         {
             "name": "sentry/sentry-laravel",
-            "version": "4.6.1",
+            "version": "4.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-laravel.git",
-                "reference": "7f5fd9f362e440c4c0c492f386b93095321f9101"
+                "reference": "d70415f19f35806acee5bcbc7403e9cb8fb5252c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/7f5fd9f362e440c4c0c492f386b93095321f9101",
-                "reference": "7f5fd9f362e440c4c0c492f386b93095321f9101",
+                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/d70415f19f35806acee5bcbc7403e9cb8fb5252c",
+                "reference": "d70415f19f35806acee5bcbc7403e9cb8fb5252c",
                 "shasum": ""
             },
             "require": {
@@ -10627,7 +10627,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-laravel/issues",
-                "source": "https://github.com/getsentry/sentry-laravel/tree/4.6.1"
+                "source": "https://github.com/getsentry/sentry-laravel/tree/4.7.1"
             },
             "funding": [
                 {
@@ -10639,7 +10639,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-06-18T15:06:09+00:00"
+            "time": "2024-07-17T13:27:43+00:00"
         },
         {
             "name": "setasign/fpdf",
@@ -10961,16 +10961,16 @@
         },
         {
             "name": "socialiteproviders/microsoft",
-            "version": "4.5.0",
+            "version": "4.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Microsoft.git",
-                "reference": "1a9928cb3091698c5c5ad108f5ff3b8a594e84fc"
+                "reference": "9f55e544f183c36096a14b2e61b5d6c9dc23961e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/1a9928cb3091698c5c5ad108f5ff3b8a594e84fc",
-                "reference": "1a9928cb3091698c5c5ad108f5ff3b8a594e84fc",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/9f55e544f183c36096a14b2e61b5d6c9dc23961e",
+                "reference": "9f55e544f183c36096a14b2e61b5d6c9dc23961e",
                 "shasum": ""
             },
             "require": {
@@ -11007,7 +11007,7 @@
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2024-07-09T22:42:09+00:00"
+            "time": "2024-07-12T02:43:55+00:00"
         },
         {
             "name": "sprain/swiss-qr-bill",
@@ -15079,23 +15079,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -15112,7 +15112,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -15147,7 +15147,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -15159,7 +15159,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -15475,16 +15475,16 @@
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.0.0",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "bc1d67f01ce8c77e3f97d48ba51fa1d81874f622"
+                "reference": "591e7d665fbab8a3b682e451641706341573eb80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/bc1d67f01ce8c77e3f97d48ba51fa1d81874f622",
-                "reference": "bc1d67f01ce8c77e3f97d48ba51fa1d81874f622",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/591e7d665fbab8a3b682e451641706341573eb80",
+                "reference": "591e7d665fbab8a3b682e451641706341573eb80",
                 "shasum": ""
             },
             "require": {
@@ -15516,7 +15516,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -15553,7 +15553,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.0.0"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.1.0"
             },
             "funding": [
                 {
@@ -15565,7 +15565,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-01T12:53:18+00:00"
+            "time": "2024-07-12T14:20:51+00:00"
         },
         {
             "name": "barryvdh/reflection-docblock",
@@ -15923,16 +15923,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
                 "shasum": ""
             },
             "require": {
@@ -15984,7 +15984,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.4.2"
             },
             "funding": [
                 {
@@ -16000,7 +16000,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2024-07-12T11:35:52+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -16715,38 +16715,38 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.1.1",
+            "version": "v8.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9"
+                "reference": "b49f5b2891ce52726adfd162841c69d4e4c84229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/13e5d538b95a744d85f447a321ce10adb28e9af9",
-                "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b49f5b2891ce52726adfd162841c69d4e4c84229",
+                "reference": "b49f5b2891ce52726adfd162841c69d4e4c84229",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.15.4",
                 "nunomaduro/termwind": "^2.0.1",
                 "php": "^8.2.0",
-                "symfony/console": "^7.0.4"
+                "symfony/console": "^7.1.2"
             },
             "conflict": {
                 "laravel/framework": "<11.0.0 || >=12.0.0",
                 "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.9.2",
-                "laravel/framework": "^11.0.0",
-                "laravel/pint": "^1.14.0",
-                "laravel/sail": "^1.28.2",
-                "laravel/sanctum": "^4.0.0",
+                "larastan/larastan": "^2.9.8",
+                "laravel/framework": "^11.16.0",
+                "laravel/pint": "^1.16.2",
+                "laravel/sail": "^1.30.2",
+                "laravel/sanctum": "^4.0.2",
                 "laravel/tinker": "^2.9.0",
-                "orchestra/testbench-core": "^9.0.0",
-                "pestphp/pest": "^2.34.1 || ^3.0.0",
-                "sebastian/environment": "^6.0.1 || ^7.0.0"
+                "orchestra/testbench-core": "^9.2.1",
+                "pestphp/pest": "^2.34.9 || ^3.0.0",
+                "sebastian/environment": "^6.1.0 || ^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -16808,7 +16808,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-03-06T16:20:09+00:00"
+            "time": "2024-07-16T22:41:01+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -17397,16 +17397,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.27",
+            "version": "10.5.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5"
+                "reference": "ff7fb85cdf88131b83e721fb2a327b664dbed275"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff7fb85cdf88131b83e721fb2a327b664dbed275",
+                "reference": "ff7fb85cdf88131b83e721fb2a327b664dbed275",
                 "shasum": ""
             },
             "require": {
@@ -17478,7 +17478,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.28"
             },
             "funding": [
                 {
@@ -17494,7 +17494,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-10T11:48:06+00:00"
+            "time": "2024-07-18T14:54:16+00:00"
         },
         {
             "name": "react/cache",
@@ -19324,16 +19324,16 @@
         },
         {
             "name": "spaze/phpstan-stripe",
-            "version": "v3.1.0",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spaze/phpstan-stripe.git",
-                "reference": "ebe8d3a7ae99f45ec024767453a09c93dedec030"
+                "reference": "f79b07804af61006473c453b83879a7d0dd6fef0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spaze/phpstan-stripe/zipball/ebe8d3a7ae99f45ec024767453a09c93dedec030",
-                "reference": "ebe8d3a7ae99f45ec024767453a09c93dedec030",
+                "url": "https://api.github.com/repos/spaze/phpstan-stripe/zipball/f79b07804af61006473c453b83879a7d0dd6fef0",
+                "reference": "f79b07804af61006473c453b83879a7d0dd6fef0",
                 "shasum": ""
             },
             "require": {
@@ -19380,9 +19380,9 @@
             ],
             "support": {
                 "issues": "https://github.com/spaze/phpstan-stripe/issues",
-                "source": "https://github.com/spaze/phpstan-stripe/tree/v3.1.0"
+                "source": "https://github.com/spaze/phpstan-stripe/tree/v3.2.0"
             },
-            "time": "2023-10-28T14:16:00+00:00"
+            "time": "2024-07-21T01:46:03+00:00"
         },
         {
             "name": "symfony/polyfill-php81",

From cd2b45edc9c342e6b6703bb54f496811e1688e4e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Jul 2024 13:05:40 +1000
Subject: [PATCH 4/7] Support rolling back converted status on a quote when the
 invoice has been deleted

---
 .../Requests/Payment/StorePaymentRequest.php  |  2 +-
 .../Payment/ValidInvoicesRules.php            |  5 +-
 .../ValidPayableInvoicesRule.php              |  2 +-
 app/Models/Invoice.php                        | 12 +++-
 .../EDocument/Gateway/Storecove/Storecove.php |  2 -
 app/Services/EDocument/Standards/Peppol.php   | 16 +++++
 app/Services/Invoice/MarkInvoiceDeleted.php   | 15 ++++-
 .../Einvoice/Storecove/StorecoveTest.php      | 63 +++++++++----------
 8 files changed, 76 insertions(+), 41 deletions(-)

diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index ea28645765..67d472836f 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -46,7 +46,7 @@ class StorePaymentRequest extends Request
 
         $rules = [
             'client_id' => ['bail','required',Rule::exists('clients', 'id')->where('company_id', $user->company()->id)->where('is_deleted', 0)],
-            'invoices' => ['bail','sometimes', 'nullable', 'array', new ValidPayableInvoicesRule()],
+            'invoices' => ['bail', 'sometimes', 'nullable', 'array', new ValidPayableInvoicesRule()],
             'invoices.*.amount' => ['bail','required'],
             'invoices.*.invoice_id' => ['bail','required','distinct', new ValidInvoicesRules($this->all()),Rule::exists('invoices', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)],
             'credits.*.credit_id' => ['bail','required','distinct', new ValidCreditsRules($this->all()),Rule::exists('credits', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)],
diff --git a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
index 6e40a6e91a..043a2419ef 100644
--- a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
+++ b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
@@ -85,11 +85,12 @@ class ValidInvoicesRules implements Rule
                 //catch here nothing to do - we need this to prevent the last elseif triggering
             } elseif ($inv->status_id == Invoice::STATUS_DRAFT && floatval($invoice['amount']) > floatval($inv->amount)) {
                 $this->error_msg = 'Amount cannot be greater than invoice balance';
-
                 return false;
             } elseif (floatval($invoice['amount']) > floatval($inv->balance)) {
                 $this->error_msg = ctrans('texts.amount_greater_than_balance_v5');
-
+                return false;
+            } elseif($inv->is_deleted){
+                $this->error_msg = 'One or more invoices in this request have since been deleted';
                 return false;
             }
         }
diff --git a/app/Http/ValidationRules/ValidPayableInvoicesRule.php b/app/Http/ValidationRules/ValidPayableInvoicesRule.php
index be422be947..1473be96fc 100644
--- a/app/Http/ValidationRules/ValidPayableInvoicesRule.php
+++ b/app/Http/ValidationRules/ValidPayableInvoicesRule.php
@@ -35,7 +35,7 @@ class ValidPayableInvoicesRule implements Rule
         $invoices = [];
 
         if (is_array($value)) {
-            $invoices = Invoice::query()->whereIn('id', array_column($value, 'invoice_id'))->company()->get();
+            $invoices = Invoice::query()->withTrashed()->whereIn('id', array_column($value, 'invoice_id'))->company()->get();
         }
 
         foreach ($invoices as $invoice) {
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 07ef8532ba..2383c0f42a 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -371,6 +371,14 @@ class Invoice extends BaseModel
         return $this->hasOne(Task::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne<Quote>
+     */
+    public function quote(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(Quote::class);
+    }
+
     public function expenses(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
         return $this->hasMany(Expense::class);
@@ -423,7 +431,9 @@ class Invoice extends BaseModel
 
     public function isPayable(): bool
     {
-        if ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
+        if($this->is_deleted)
+            return false;
+        elseif ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
             return true;
         } elseif ($this->status_id == self::STATUS_SENT && $this->is_deleted == false) {
             return true;
diff --git a/app/Services/EDocument/Gateway/Storecove/Storecove.php b/app/Services/EDocument/Gateway/Storecove/Storecove.php
index fe1d0bbc1f..a56ea37000 100644
--- a/app/Services/EDocument/Gateway/Storecove/Storecove.php
+++ b/app/Services/EDocument/Gateway/Storecove/Storecove.php
@@ -48,11 +48,9 @@ class Storecove {
 
     //config('ninja.storecove_api_key');
 
-
     //https://app.storecove.com/en/docs#_test_identifiers
     //check if identifier is able to send on the network.
 
-
     //response = {  "code": "OK",  "email": false}
     public function discovery($identifier, $scheme, $network = 'peppol')
     {
diff --git a/app/Services/EDocument/Standards/Peppol.php b/app/Services/EDocument/Standards/Peppol.php
index 8387a799e4..4bc0ffe8ca 100644
--- a/app/Services/EDocument/Standards/Peppol.php
+++ b/app/Services/EDocument/Standards/Peppol.php
@@ -47,6 +47,8 @@ use InvoiceNinja\EInvoice\Models\Peppol\TaxCategoryType\ClassifiedTaxCategory;
 use InvoiceNinja\EInvoice\Models\Peppol\CustomerPartyType\AccountingCustomerParty;
 use InvoiceNinja\EInvoice\Models\Peppol\SupplierPartyType\AccountingSupplierParty;
 use InvoiceNinja\EInvoice\Models\Peppol\FinancialAccountType\PayeeFinancialAccount;
+use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\ID;
+use InvoiceNinja\EInvoice\Models\Peppol\PartyIdentification;
 
 class Peppol extends AbstractService
 {
@@ -115,6 +117,7 @@ class Peppol extends AbstractService
         // ->setPaymentMeansCode($invoice->custom_value1)
         // ->setPayeeFinancialAccount($payeeFinancialAccount);
         // $ubl_invoice->setPaymentMeans($paymentMeans);
+        return $this;
 
     }
 
@@ -464,6 +467,19 @@ $tax_amount->amount = $this->invoice->uses_inclusive_taxes ? $this->calcInclusiv
 
         $party = new Party();
 
+        if(strlen($this->invoice->client->vat_number ?? '') > 1) {
+            
+            $pi = new PartyIdentification;
+            $vatID = new ID;
+            $vatID->schemeID = 'IT:VAT';
+            $vatID->value = $this->invoice->client->vat_number;
+ 
+            $pi->ID = $vatID;
+
+            $party->PartyIdentification[] = $pi;
+
+        }
+
         $party_name = new PartyName();
         $party_name->Name = $this->invoice->client->present()->name();
         $party->PartyName[] = $party_name;
diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php
index 22860d9725..65125740d0 100644
--- a/app/Services/Invoice/MarkInvoiceDeleted.php
+++ b/app/Services/Invoice/MarkInvoiceDeleted.php
@@ -13,6 +13,7 @@ namespace App\Services\Invoice;
 
 use App\Jobs\Inventory\AdjustProductInventory;
 use App\Models\Invoice;
+use App\Models\Quote;
 use App\Services\AbstractService;
 use App\Utils\Traits\GeneratesCounter;
 
@@ -45,7 +46,8 @@ class MarkInvoiceDeleted extends AbstractService
              ->deletePaymentables()
              ->adjustPayments()
              ->adjustPaidToDateAndBalance()
-             ->adjustLedger();
+             ->adjustLedger()
+             ->triggeredActions();
 
         return $this->invoice;
     }
@@ -182,4 +184,15 @@ class MarkInvoiceDeleted extends AbstractService
 
         return $this;
     }
+
+    private function triggeredActions(): self
+    {
+        if($this->invoice->quote){
+            $this->invoice->quote->invoice_id = null;
+            $this->invoice->quote->status_id = Quote::STATUS_SENT;
+            $this->invoice->pushQuietly();
+        }
+
+        return $this;
+    }
 }
diff --git a/tests/Integration/Einvoice/Storecove/StorecoveTest.php b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
index e121caf0ba..9b3178a44b 100644
--- a/tests/Integration/Einvoice/Storecove/StorecoveTest.php
+++ b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
@@ -31,46 +31,44 @@ class StorecoveTest extends TestCase
             $this->markTestSkipped("do not run in CI");
     }
 
-    public function testCreateLegalEntity()
-    {
+    // public function testCreateLegalEntity()
+    // {
 
-        $data = [
-            'acts_as_receiver' => true,
-            'acts_as_sender' => true,
-            'advertisements' => ['invoice'],
-            'city' => $this->company->settings->city,
-            'country' => 'DE',
-            'county' => $this->company->settings->state,
-            'line1' => $this->company->settings->address1,
-            'line2' => $this->company->settings->address2,
-            'party_name' => $this->company->present()->name(),
-            'tax_registered' => true,
-            'tenant_id' => $this->company->company_key,
-            'zip' => $this->company->settings->postal_code,
-            'peppol_identifiers' => [
-                'scheme' => 'DE:VAT',
-                'id' => 'DE:VAT'
-            ],
-        ];
+    //     $data = [
+    //         'acts_as_receiver' => true,
+    //         'acts_as_sender' => true,
+    //         'advertisements' => ['invoice'],
+    //         'city' => $this->company->settings->city,
+    //         'country' => 'DE',
+    //         'county' => $this->company->settings->state,
+    //         'line1' => $this->company->settings->address1,
+    //         'line2' => $this->company->settings->address2,
+    //         'party_name' => $this->company->present()->name(),
+    //         'tax_registered' => true,
+    //         'tenant_id' => $this->company->company_key,
+    //         'zip' => $this->company->settings->postal_code,
+    //         'peppol_identifiers' => [
+    //             'scheme' => 'DE:VAT',
+    //             'id' => 'DE:VAT'
+    //         ],
+    //     ];
 
-        $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
-        $r = $sc->createLegalEntity($data, $this->company);
+    //     $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
+    //     $r = $sc->createLegalEntity($data, $this->company);
 
-        $this->assertIsArray($r);
+    //     $this->assertIsArray($r);
 
-    }
+    // }
 
-    public function tesXAddPeppolIdentifier()
-    {
+    // public function testAddPeppolIdentifier()
+    // {
         
-            $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
-            $r = $sc->addIdentifier(290868, "DE923356489", "DE:VAT");
+    //         $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
+    //         $r = $sc->addIdentifier(290868, "DE923356489", "DE:VAT");
 
-            // nlog($r->body());
-            // $this->assertIsArray($r);
-            nlog($r);
+    //         nlog($r);
         
-    }
+    // }
 
     // public function testUpdateLegalEntity()
     // {
@@ -91,7 +89,6 @@ class StorecoveTest extends TestCase
 
     public function testGetLegalEntity()
     {
-
         
         $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
         $r = $sc->getLegalEntity(290868);

From 32ac47e3f417a7c9e6c465e27ceab716e6b105e3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Jul 2024 14:01:38 +1000
Subject: [PATCH 5/7] Update Peppol integration with definitions for dedicated
 schemeID

---
 app/Services/EDocument/Standards/Peppol.php | 70 +++++++++++++++++++++
 composer.lock                               | 12 ++--
 2 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/app/Services/EDocument/Standards/Peppol.php b/app/Services/EDocument/Standards/Peppol.php
index 4bc0ffe8ca..c79a25f38e 100644
--- a/app/Services/EDocument/Standards/Peppol.php
+++ b/app/Services/EDocument/Standards/Peppol.php
@@ -55,6 +55,76 @@ class Peppol extends AbstractService
     use Taxer;
     use NumberFormatter;
     
+    /**
+     * used as a proxy for 
+     * the schemeID of partyidentification
+     * property - for Storecove only:
+     * 
+     * Used in the format key:value
+     * 
+     * ie. IT:IVA / DE:VAT
+     * 
+     * Note there are multiple options for the following countries:
+     * 
+     * US (EIN/SSN) employer identification number / social security number
+     * IT (CF/IVA) Codice Fiscale (person/company identifier) / company vat number
+     *
+     * @var array
+     */
+    private array $schemeIdIdentifiers = [
+        'US' => 'EIN', 
+        'US' => 'SSN',
+        'NZ' => 'GST',
+        'CH' => 'VAT',
+        'IS' => 'VAT',
+        'LI' => 'VAT',
+        'NO' => 'VAT',
+        'AD' => 'VAT',
+        'AL' => 'VAT',
+        'AT' => 'VAT',
+        'BA' => 'VAT',
+        'BE' => 'VAT',
+        'BG' => 'VAT',
+        'CY' => 'VAT',
+        'CZ' => 'VAT',
+        'DE' => 'VAT',
+        'DK' => 'ERST',
+        'EE' => 'VAT',
+        'ES' => 'VAT',
+        'FI' => 'VAT',
+        'FR' => 'VAT',
+        'GR' => 'VAT',
+        'HR' => 'VAT',
+        'HU' => 'VAT',
+        'IE' => 'VAT',
+        'IT' => 'IVA',
+        'IT' => 'CF',,
+        'LT' => 'VAT',
+        'LU' => 'VAT',
+        'LV' => 'VAT',
+        'MC' => 'VAT',
+        'ME' => 'VAT',
+        'MK' => 'VAT',
+        'MT' => 'VAT',
+        'NL' => 'VAT',
+        'PL' => 'VAT',
+        'PT' => 'VAT',
+        'RO' => 'VAT',
+        'RS' => 'VAT',
+        'SE' => 'VAT',
+        'SI' => 'VAT',
+        'SK' => 'VAT',
+        'SM' => 'VAT',
+        'TR' => 'VAT',
+        'VA' => 'VAT',
+        'IN' => 'GSTIN',
+        'JP' => 'IIN',
+        'MY' => 'TIN',
+        'SG' => 'GST',
+        'GB' => 'VAT',
+        'SA' => 'TIN',
+    ];
+
     private array $InvoiceTypeCodes = [
         "380" => "Commercial invoice",
         "381" => "Credit note",
diff --git a/composer.lock b/composer.lock
index 2aae0f6766..0037775a98 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2581,7 +2581,7 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.364.0",
+            "version": "v0.365.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
@@ -2619,7 +2619,7 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
-                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.364.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.365.0"
             },
             "time": "2024-07-11T01:08:44+00:00"
         },
@@ -4058,12 +4058,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/invoiceninja/einvoice.git",
-                "reference": "29736fb1a007f5fa52aee811397e1ef6611b1b8d"
+                "reference": "d4f80316744bbd31245900ec9799a6f66a663ed6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/invoiceninja/einvoice/zipball/29736fb1a007f5fa52aee811397e1ef6611b1b8d",
-                "reference": "29736fb1a007f5fa52aee811397e1ef6611b1b8d",
+                "url": "https://api.github.com/repos/invoiceninja/einvoice/zipball/d4f80316744bbd31245900ec9799a6f66a663ed6",
+                "reference": "d4f80316744bbd31245900ec9799a6f66a663ed6",
                 "shasum": ""
             },
             "require": {
@@ -4105,7 +4105,7 @@
                 "source": "https://github.com/invoiceninja/einvoice/tree/main",
                 "issues": "https://github.com/invoiceninja/einvoice/issues"
             },
-            "time": "2024-07-11T06:34:33+00:00"
+            "time": "2024-07-22T02:40:27+00:00"
         },
         {
             "name": "invoiceninja/inspector",

From 80274b34a93a1fce58fcedfb2c4ab65dfeabc57a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Jul 2024 14:21:12 +1000
Subject: [PATCH 6/7]  updates for peppol

---
 app/Services/EDocument/Standards/Peppol.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Services/EDocument/Standards/Peppol.php b/app/Services/EDocument/Standards/Peppol.php
index c79a25f38e..99e6753aea 100644
--- a/app/Services/EDocument/Standards/Peppol.php
+++ b/app/Services/EDocument/Standards/Peppol.php
@@ -87,7 +87,7 @@ class Peppol extends AbstractService
         'BG' => 'VAT',
         'CY' => 'VAT',
         'CZ' => 'VAT',
-        'DE' => 'VAT',
+        'DE' => 'VAT', //tested - requires Payment Means to be defined.
         'DK' => 'ERST',
         'EE' => 'VAT',
         'ES' => 'VAT',
@@ -97,8 +97,8 @@ class Peppol extends AbstractService
         'HR' => 'VAT',
         'HU' => 'VAT',
         'IE' => 'VAT',
-        'IT' => 'IVA',
-        'IT' => 'CF',,
+        'IT' => 'IVA', //tested - Requires a Customer Party Identification (VAT number)
+        'IT' => 'CF', //tested - Requires a Customer Party Identification (VAT number)
         'LT' => 'VAT',
         'LU' => 'VAT',
         'LV' => 'VAT',

From a236da0149ae7bac5023efed7a2aeebaf4c81075 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Jul 2024 19:31:19 +1000
Subject: [PATCH 7/7] v5.10.13

---
 VERSION.txt                                   |  2 +-
 app/Console/Commands/CreateSingleAccount.php  | 43 ++++++++++++
 app/Services/EDocument/Standards/Peppol.php   | 67 ++++++++++++++++---
 composer.json                                 |  6 +-
 composer.lock                                 | 49 ++++++++------
 config/ninja.php                              |  4 +-
 .../Einvoice/Storecove/StorecoveTest.php      | 45 ++++++++++++-
 tests/MockAccountData.php                     |  1 +
 8 files changed, 182 insertions(+), 35 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 645ef4b267..d315f4df75 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.12
\ No newline at end of file
+5.10.13
\ No newline at end of file
diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
index 50d915cca2..4a2146a334 100644
--- a/app/Console/Commands/CreateSingleAccount.php
+++ b/app/Console/Commands/CreateSingleAccount.php
@@ -385,6 +385,9 @@ class CreateSingleAccount extends Command
 
         });
 
+
+        $this->countryClients($company, $user);
+
         $this->info("finished");
 
     }
@@ -1109,4 +1112,44 @@ class CreateSingleAccount extends Command
 
         event(new RecurringInvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars()));
     }
+
+
+    private function countryClients($company, $user)
+    {
+        
+        Client::unguard();
+
+        Client::create([
+            'company_id' => $company->id,
+            'user_id' => $user->id,
+            'name' => 'Swiss Company AG',
+            'website' => 'https://www.testcompany.ch',
+            'private_notes' => 'These are some private notes about the test client.',
+            'balance' => 0,
+            'paid_to_date' => 0,
+            'vat_number' => '654321987',
+            'id_number' => 'CH9300762011623852957', // Sample Swiss IBAN
+            'custom_value1' => '2024-07-22 10:00:00',
+            'custom_value2' => 'blue',
+            'custom_value3' => 'sampleword',
+            'custom_value4' => 'test@example.com',
+            'address1' => '123',
+            'address2' => 'Test Street 45',
+            'city' => 'Zurich',
+            'state' => 'Zurich',
+            'postal_code' => '8001',
+            'country_id' => '756', // Switzerland
+            'shipping_address1' => '123',
+            'shipping_address2' => 'Test Street 45',
+            'shipping_city' => 'Zurich',
+            'shipping_state' => 'Zurich',
+            'shipping_postal_code' => '8001',
+            'shipping_country_id' => '756', // Switzerland
+            'settings' => ClientSettings::Defaults(),
+            'client_hash' => \Illuminate\Support\Str::random(32),
+            'routing_id' => '',
+        ]);
+
+    }
+
 }
diff --git a/app/Services/EDocument/Standards/Peppol.php b/app/Services/EDocument/Standards/Peppol.php
index 99e6753aea..0fe4cf5d18 100644
--- a/app/Services/EDocument/Standards/Peppol.php
+++ b/app/Services/EDocument/Standards/Peppol.php
@@ -75,7 +75,7 @@ class Peppol extends AbstractService
         'US' => 'EIN', 
         'US' => 'SSN',
         'NZ' => 'GST',
-        'CH' => 'VAT',
+        'CH' => 'VAT', // VAT number = CHE - 999999999 - MWST|IVA|VAT
         'IS' => 'VAT',
         'LI' => 'VAT',
         'NO' => 'VAT',
@@ -85,6 +85,12 @@ class Peppol extends AbstractService
         'BA' => 'VAT',
         'BE' => 'VAT',
         'BG' => 'VAT',
+        'AU' => 'ABN', //Australia	
+        'CA' => 'CBN', //Canada
+        'MX' => 'RFC', //Mexico
+        'NZ' => 'GST', //Nuuu zulund
+        'GB' => 'VAT', //Great Britain
+        'SA' => 'TIN', //South Africa
         'CY' => 'VAT',
         'CZ' => 'VAT',
         'DE' => 'VAT', //tested - requires Payment Means to be defined.
@@ -175,8 +181,10 @@ class Peppol extends AbstractService
         $this->p_invoice->AccountingSupplierParty = $this->getAccountingSupplierParty();
         $this->p_invoice->AccountingCustomerParty = $this->getAccountingCustomerParty();
         $this->p_invoice->InvoiceLine = $this->getInvoiceLines();
+        
         $this->p_invoice->TaxTotal = $this->getTotalTaxes();
         $this->p_invoice->LegalMonetaryTotal = $this->getLegalMonetaryTotal();
+
         // $this->p_invoice->PaymentMeans = $this->getPaymentMeans();
 
         // $payeeFinancialAccount = (new PayeeFinancialAccount())
@@ -191,8 +199,8 @@ class Peppol extends AbstractService
 
     }
 
-    private function getPaymentMeans(): PaymentMeans
-    {
+    // private function getPaymentMeans(): PaymentMeans
+    // {
         // $payeeFinancialAccount = new PayeeFinancialAccount()
         // $payeeFinancialAccount->
 
@@ -200,7 +208,7 @@ class Peppol extends AbstractService
         // $ppm->PayeeFinancialAccount = $payeeFinancialAccount;
 
         // return $ppm;
-    }
+    // }
 
     private function getLegalMonetaryTotal(): LegalMonetaryTotal
     {
@@ -231,6 +239,16 @@ class Peppol extends AbstractService
         return $lmt;
     }
 
+    private function getTotalTaxAmount(): float
+    {
+        if(!$this->invoice->total_taxes)
+            return 0;
+        elseif($this->invoice->uses_inclusive_taxes)
+            return $this->invoice->total_taxes;
+        
+        return $this->calcAmountLineTax($this->invoice->tax_rate1, $this->invoice->amount) ?? 0;
+    }
+
     private function getTotalTaxes(): array
     {
         $taxes = [];
@@ -241,8 +259,7 @@ class Peppol extends AbstractService
 
             $tax_amount = new TaxAmount();
             $tax_amount->currencyID = $this->invoice->client->currency()->code;
-            // $tax_amount->amount = $this->invoice->uses_inclusive_taxes ?  $this->calcInclusiveLineTax($this->invoice->tax_rate1, $this->invoice->amount) : $this->calcAmountLineTax($this->invoice->tax_rate1, $this->invoice->amount);
-            $tax_amount->amount = $this->invoice->uses_inclusive_taxes ? $this->invoice->total_taxes : $this->calcAmountLineTax($this->invoice->tax_rate1, $this->invoice->amount);
+            $tax_amount->amount = $this->getTotalTaxAmount();
 
             $tax_subtotal = new TaxSubtotal();
             $tax_subtotal->TaxAmount = $tax_amount;
@@ -256,7 +273,7 @@ class Peppol extends AbstractService
             $tc->ID = $type_id == '2' ? 'HUR' : 'C62';
             $tc->Percent = $this->invoice->tax_rate1;
             $ts = new PeppolTaxScheme();
-            $ts->ID = $this->invoice->tax_name1;
+            $ts->ID = strlen($this->invoice->tax_name1 ?? '') > 1 ? $this->invoice->tax_name1 : '0'; 
             $tc->TaxScheme = $ts;
             $tax_subtotal->TaxCategory = $tc;
 
@@ -363,6 +380,9 @@ class Peppol extends AbstractService
             if(count($item_taxes) > 0) {
                 $line->TaxTotal = $item_taxes;
             }
+            // else {
+            //     $line->TaxTotal = $this->zeroTaxAmount();
+            // }
 
             $price = new Price();
             $pa = new PriceAmount();
@@ -393,6 +413,37 @@ class Peppol extends AbstractService
         return $cost;
     }
 
+    private function zeroTaxAmount(): array
+    {
+        $blank_tax = [];
+
+        $tax_amount = new TaxAmount();
+        $tax_amount->currencyID = $this->invoice->client->currency()->code;
+        $tax_amount->amount = '0';
+        $tax_subtotal = new TaxSubtotal();
+        $tax_subtotal->TaxAmount = $tax_amount;
+
+        $taxable_amount = new TaxableAmount();
+        $taxable_amount->currencyID = $this->invoice->client->currency()->code;
+        $taxable_amount->amount = '0';
+        $tax_subtotal->TaxableAmount = $taxable_amount;
+        $tc = new TaxCategory();
+        $tc->ID = 'Z';
+        $tc->Percent = 0;
+        $ts = new PeppolTaxScheme();
+        $ts->ID = '0';
+        $tc->TaxScheme = $ts;
+        $tax_subtotal->TaxCategory = $tc;
+
+        $tax_total = new TaxTotal();
+        $tax_total->TaxAmount = $tax_amount;
+        $tax_total->TaxSubtotal[] = $tax_subtotal;
+        $blank_tax[] = $tax_total;
+
+
+        return $blank_tax;
+    }
+
     private function getItemTaxes(object $item): array
     {
         $item_taxes = [];
@@ -541,7 +592,7 @@ $tax_amount->amount = $this->invoice->uses_inclusive_taxes ? $this->calcInclusiv
             
             $pi = new PartyIdentification;
             $vatID = new ID;
-            $vatID->schemeID = 'IT:VAT';
+            $vatID->schemeID = 'CH:MWST';
             $vatID->value = $this->invoice->client->vat_number;
  
             $pi->ID = $vatID;
diff --git a/composer.json b/composer.json
index 49afd89e94..ad25d17058 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
         "authorizenet/authorizenet": "^2.0",
         "awobaz/compoships": "^2.1",
         "bacon/bacon-qr-code": "^2.0",
-        "beganovich/snappdf": "^5",
+        "beganovich/snappdf": "dev-master",
         "braintree/braintree_php": "^6.0",
         "btcpayserver/btcpayserver-greenfield-php": "^2.6",
         "checkout/checkout-sdk-php": "^3.0",
@@ -194,6 +194,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/beganovich/php-ansible"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/turbo124/snappdf"
         }
     ],
     "minimum-stability": "dev",
diff --git a/composer.lock b/composer.lock
index 0037775a98..541f0c0452 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7c67ca71986b97fc72bba5eba530e878",
+    "content-hash": "edc6905124cb32fef6a13befb3d5a4e1",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -684,16 +684,16 @@
         },
         {
             "name": "beganovich/snappdf",
-            "version": "v5.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/beganovich/snappdf.git",
-                "reference": "3b21c7a88a4d05b01a606bc74f1950b0e9e820b1"
+                "url": "https://github.com/turbo124/snappdf.git",
+                "reference": "adadaf593dca174db46efa139bdff844b3a64da8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beganovich/snappdf/zipball/3b21c7a88a4d05b01a606bc74f1950b0e9e820b1",
-                "reference": "3b21c7a88a4d05b01a606bc74f1950b0e9e820b1",
+                "url": "https://api.github.com/repos/turbo124/snappdf/zipball/adadaf593dca174db46efa139bdff844b3a64da8",
+                "reference": "adadaf593dca174db46efa139bdff844b3a64da8",
                 "shasum": ""
             },
             "require": {
@@ -708,6 +708,7 @@
                 "friendsofphp/php-cs-fixer": "^3.6",
                 "phpunit/phpunit": "^11.0"
             },
+            "default-branch": true,
             "bin": [
                 "snappdf"
             ],
@@ -717,7 +718,11 @@
                     "Beganovich\\Snappdf\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "Test\\Snappdf\\": "tests/"
+                }
+            },
             "license": [
                 "MIT"
             ],
@@ -729,10 +734,9 @@
             ],
             "description": "Convert webpages or HTML into the PDF file using Chromium or Google Chrome.",
             "support": {
-                "issues": "https://github.com/beganovich/snappdf/issues",
-                "source": "https://github.com/beganovich/snappdf/tree/v5.0"
+                "source": "https://github.com/turbo124/snappdf/tree/master"
             },
-            "time": "2024-03-20T22:03:41+00:00"
+            "time": "2024-07-22T09:26:26+00:00"
         },
         {
             "name": "braintree/braintree_php",
@@ -18944,16 +18948,16 @@
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.6.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
+                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/1a9a145b044677ae3424693f7b06479fc8c137a9",
+                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9",
                 "shasum": ""
             },
             "require": {
@@ -18991,7 +18995,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
+                "source": "https://github.com/spatie/backtrace/tree/1.6.2"
             },
             "funding": [
                 {
@@ -19003,20 +19007,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-04-24T13:22:11+00:00"
+            "time": "2024-07-22T08:21:24+00:00"
         },
         {
             "name": "spatie/error-solutions",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13"
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/4bb6c734dc992b2db3e26df1ef021c75d2218b13",
-                "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/a014da18f2675ea15af0ba97f7e9aee59e13964f",
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f",
                 "shasum": ""
             },
             "require": {
@@ -19069,7 +19073,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.0.5"
+                "source": "https://github.com/spatie/error-solutions/tree/1.1.0"
             },
             "funding": [
                 {
@@ -19077,7 +19081,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-09T12:13:32+00:00"
+            "time": "2024-07-22T08:18:22+00:00"
         },
         {
             "name": "spatie/flare-client-php",
@@ -19577,6 +19581,7 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "asm/php-ansible": 20,
+        "beganovich/snappdf": 20,
         "horstoeko/orderx": 20,
         "invoiceninja/einvoice": 20,
         "socialiteproviders/apple": 20
diff --git a/config/ninja.php b/config/ninja.php
index 44f971416b..c832656df1 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.12'),
-    'app_tag' => env('APP_TAG', '5.10.12'),
+    'app_version' => env('APP_VERSION', '5.10.13'),
+    'app_tag' => env('APP_TAG', '5.10.13'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),
diff --git a/tests/Integration/Einvoice/Storecove/StorecoveTest.php b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
index 9b3178a44b..f37af88946 100644
--- a/tests/Integration/Einvoice/Storecove/StorecoveTest.php
+++ b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
@@ -11,6 +11,8 @@
 
 namespace Tests\Integration\Einvoice\Storecove;
 
+use App\DataMapper\ClientSettings;
+use App\Models\Client;
 use Tests\TestCase;
 use Tests\MockAccountData;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -64,7 +66,7 @@ class StorecoveTest extends TestCase
     // {
         
     //         $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
-    //         $r = $sc->addIdentifier(290868, "DE923356489", "DE:VAT");
+    //         $r = $sc->addIdentifier(291394, "DE923356489", "DE:VAT");
 
     //         nlog($r);
         
@@ -347,4 +349,45 @@ $x = '<?xml version="1.0" encoding="utf-8"?>
 
     }
 
+    public function testCreateCHClient()
+    {
+      
+      Client::unguard();
+
+      $c = 
+      Client::create([
+          'company_id' => $this->company->id,
+          'user_id' => $this->user->id,
+          'name' => 'Test Company AG',
+          'website' => 'https://www.testcompany.ch',
+          'private_notes' => 'These are some private notes about the test client.',
+          'balance' => 0,
+          'paid_to_date' => 0,
+          'vat_number' => '654321987',
+          'id_number' => 'CH9300762011623852957', // Sample Swiss IBAN
+          'custom_value1' => '2024-07-22 10:00:00',
+          'custom_value2' => 'blue',
+          'custom_value3' => 'sampleword',
+          'custom_value4' => 'test@example.com',
+          'address1' => '123',
+          'address2' => 'Test Street 45',
+          'city' => 'Zurich',
+          'state' => 'Zurich',
+          'postal_code' => '8001',
+          'country_id' => '756', // Switzerland
+          'shipping_address1' => '123',
+          'shipping_address2' => 'Test Street 45',
+          'shipping_city' => 'Zurich',
+          'shipping_state' => 'Zurich',
+          'shipping_postal_code' => '8001',
+          'shipping_country_id' => '756', // Switzerland
+          'settings' => ClientSettings::Defaults(),
+          'client_hash' => \Illuminate\Support\Str::random(32),
+          'routing_id' => '',
+      ]);
+
+
+      $this->assertInstanceOf(\App\Models\Client::class, $c);
+
+    }
 }
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index c2d047d2fe..4229db6ebc 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -848,4 +848,5 @@ trait MockAccountData
 
         return $line_items;
     }
+
 }