Updated translations

app/Jobs/Mailgun/ProcessMailgunWebhook.php

@@ -68,6 +68,7 @@ class ProcessMailgunWebhook implements ShouldQueue
         return SystemLog::query()
                 ->where('company_id', $this->invitation->company_id)
                 ->where('type_id', SystemLog::TYPE_WEBHOOK_RESPONSE)
+                ->where('category_id', SystemLog::CATEGORY_MAIL)
                 ->whereJsonContains('log', ['MessageID' => $this->message_id])
                 ->orderBy('id', 'desc')
                 ->first();

app/Models/Client.php

@@ -336,7 +336,7 @@ class Client extends BaseModel implements HasLocalePreference
 
     public function activities(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(Activity::class)->take(50)->orderBy('id', 'desc');
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->take(50)->orderBy('id', 'desc');
     }
 
     public function contacts(): HasMany

app/Models/Company.php

@@ -411,6 +411,7 @@ class Company extends BaseModel
         'smtp_password' => 'encrypted',
         'e_invoice' => 'object',
         'quickbooks' => QuickbooksSettings::class,
+        'smtp_port' => 'int',
     ];
 
     protected $with = [];

app/Models/Credit.php

@@ -231,7 +231,7 @@ class Credit extends BaseModel
 
     public function activities(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->where('client_id', $this->client_id)->orderBy('id', 'DESC')->take(50);
     }
 
     public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Models/PurchaseOrder.php

@@ -255,8 +255,8 @@ class PurchaseOrder extends BaseModel
     }
 
     public function activities(): \Illuminate\Database\Eloquent\Relations\HasMany
-    {
+    {   
-        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->where('vendor_id', $this->vendor_id)->orderBy('id', 'DESC')->take(50);
     }
 
     public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Models/Quote.php

@@ -236,7 +236,7 @@ class Quote extends BaseModel
 
     public function activities(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->where('client_id', $this->client_id)->orderBy('id', 'DESC')->take(50);
     }
 
     public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Models/RecurringInvoice.php

@@ -285,7 +285,7 @@ class RecurringInvoice extends BaseModel
 
     public function activities()
     {
-        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->where('client_id', $this->client_id)->orderBy('id', 'DESC')->take(50);
     }
 
     public function history()

app/Models/RecurringQuote.php

@@ -269,7 +269,7 @@ class RecurringQuote extends BaseModel
 
     public function activities()
     {
-        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
+        return $this->hasMany(Activity::class)->where('company_id', $this->company_id)->where('client_id', $this->client_id)->orderBy('id', 'DESC')->take(50);
     }
 
     public function history()

lang/en/texts.php

@@ -5338,6 +5338,22 @@ $lang = array(
     'no_unread_notifications' => 'You’re all caught up! No new notifications.',
     'how_to_import_data' => 'How to import data',
     'download_example_file' => 'Download example file',
+    'expense_mailbox' => 'Inbound e-mail address',
+    'expense_mailbox_help' => 'The inbound email address which accepts expense documents. ie. expense@invoiceninja.com',
+    'expense_mailbox_active' => 'Expense Mailbox',
+    'expense_mailbox_active_help' => 'Enables processing of documents such as receipts for expense reporting',
+    'inbound_mailbox_allow_company_users' => 'Allow Company Senders',
+    'inbound_mailbox_allow_company_users_help' => 'Allows users within the company to send expense documents.',
+    'inbound_mailbox_allow_vendors' => 'Allow Vendor Senders',
+    'inbound_mailbox_allow_vendors_help' => 'Allows company vendors to send expense documents',
+    'inbound_mailbox_allow_clients' => 'Allow Client Senders',
+    'inbound_mailbox_allow_clients_help' => 'Allows clients to send expense documents',
+    'inbound_mailbox_whitelist' => 'Inbound sender allow list',
+    'inbound_mailbox_whitelist_help' => 'Comma separated list of emails that should be allowed to send emails for processing',
+    'inbound_mailbox_blacklist' => 'Inbound sender banned list',
+    'inbound_mailbox_blacklist_help' => 'Comma separate list of emails that are disallowed to send emails for processing',
+    'inbound_mailbox_allow_unknown' => 'Allow All Senders',
+    'inbound_mailbox_allow_unknown_help' => 'Allow anyone to send an expense email for processing',
 );
 
 return $lang;

lang/es_ES/texts.php

@@ -2488,6 +2488,8 @@ Una vez que tenga los montos, vuelva a esta página de métodos de pago y haga c
     'local_storage_required' => 'Error: almacenaje local no disponible.',
     'your_password_reset_link' => 'Enlace para reiniciar su password',
     'subdomain_taken' => 'El subdominio ya está en uso',
+    'expense_mailbox_taken' => 'La bandeja de entrada ya está en uso.',
+    'expense_mailbox_invalid' => 'La bandeja de entrada no coincide con el esquema requerido.',
     'client_login' => 'Acceso de Clientes',
     'converted_amount' => 'Cuenta convertida',
     'default' => 'Por defecto',
@@ -3885,7 +3887,7 @@ Una vez que tenga los montos, vuelva a esta página de métodos de pago y haga c
     'payment_method_saving_failed' => 'El método de pago no se puede guardar para uso futuro.',
     'pay_with' => 'Pagar con',
     'n/a' => 'N/D',
-    'by_clicking_next_you_accept_terms' => 'Pulsando "Siguiente paso" aceptas los términos.',
+    'by_clicking_next_you_accept_terms' => 'Al pulsar en "Siguiente", aceptas los términos.',
     'not_specified' => 'No especificado',
     'before_proceeding_with_payment_warning' => 'Antes de proceder al pago, debes rellenar los siguientes campos',
     'after_completing_go_back_to_previous_page' => 'Después de completar, vuelve a la página anterior.',
@@ -5307,7 +5309,32 @@ De lo contrario, este campo deberá dejarse en blanco.',
     'enter_information_for_the_account_holder' => 'Introducir información del titular de la cuenta',
     'customer_type' => 'Tipo de cliente',
     'process_date' => 'Fecha de procesamiento',
-    'forever_free' => 'Forever Free',
+    'forever_free' => 'Siempre gratis.',
+    'comments_only' => 'Solo comentarios',
+    'payment_balance_on_file' => 'Saldo de pago en archivo',
+    'ubl_email_attachment_help' => 'Para más configuraciones de e-factura, por favor navega :here',
+    'stop_task_to_add_task_entry' => 'Necesitas detener la tarea antes de agregar un nuevo elemento',
+    'xml_file' => 'Archivo XML',
+    'one_page_checkout' => 'Proceso de compra en una sola página',
+    'one_page_checkout_help' => 'Habilitar el nuevo flujo de pago de una sola página',
+    'applies_to' => 'Aplica a',
+    'accept_purchase_order' => 'Aceptar orden de compra',
+    'round_to_seconds' => 'Redondear a segundos',
+    'activity_142' => 'Recordatorio de presupuesto :number enviado 1 vez',
+    'activity_143' => 'La facturación automática se realizó con éxito para la factura :invoice',
+    'activity_144' => 'La facturación automática falló para la factura :invoice. :notes',
+    'activity_145' => 'La e-factura :invoice para :client fue entregada electrónicamente :notes',
+    'payment_failed' => 'El pago ha fallado',
+    'ssl_host_override' => 'Anulación de host SSL',
+    'upload_logo_short' => 'Subir logo',
+    'country_Melilla' => 'Melilla (España)',
+    'country_Ceuta' => 'Ceuta (España)',
+    'country_Canary Islands' => 'Islas Canarias (España)',
+    'lang_Vietnamese' => 'Vietnamita',
+    'invoice_status_changed' => 'Por favor, ten en cuenta que el estado de tu factura ha sido actualizado. Te recomendamos actualizar la página para ver la versión más actual.',
+    'no_unread_notifications' => '¡Estás al día! No hay nuevas notificaciones',
+    'how_to_import_data' => 'How to import data',
+    'download_example_file' => 'Download example file',
 );
 
 return $lang;

lang/fr_CA/texts.php

@@ -5334,6 +5334,8 @@ Développe automatiquement la section des notes dans le tableau de produits pour
     'lang_Vietnamese' => 'Vietnamien',
     'invoice_status_changed' => 'Veuillez noter que l\'état de votre facture a été mis à jour. Nous vous recommandons de rafraîchir la page pour afficher la version la plus récente.',
     'no_unread_notifications' => 'Vous êtes à jour! Aucune nouvelle notification.',
+    'how_to_import_data' => 'Comment importer vos données',
+    'download_example_file' => 'Télécharger un fichier exemple',
 );
 
 return $lang;

lang/nl/texts.php

@@ -5333,8 +5333,11 @@ E-mail: :email<b><br><b>',
     'country_Melilla' => 'Melilla',
     'country_Ceuta' => 'Ceuta',
     'country_Canary Islands' => 'Canarische Eilanden',
-    'invoice_status_changed' => 'Please note that the status of your invoice has been updated. We recommend refreshing the page to view the most current version.',
+    'lang_Vietnamese' => 'Vietnamees',
-    'no_unread_notifications' => 'You’re all caught up! No new notifications.',
+    'invoice_status_changed' => 'De status van uw factuur is veranderd. We raden aan om deze pagina te verversen voor de meest recente versie.',
+    'no_unread_notifications' => 'U bent weer helemaal bij! Er zijn geen nieuwe notificaties.',
+    'how_to_import_data' => 'Hoe u gegevens kunt importeren',
+    'download_example_file' => 'Download voorbeeldbestand',
 );
 
 return $lang;

lang/vi/texts.php

@@ -5336,6 +5336,8 @@ $lang = array(
     'lang_Vietnamese' => 'Tiếng Việt',
     'invoice_status_changed' => 'Xin lưu ý rằng trạng thái hóa đơn của bạn đã được cập nhật. Chúng tôi khuyên bạn nên làm mới trang để xem phiên bản mới nhất.',
     'no_unread_notifications' => 'Bạn đã cập nhật đầy đủ rồi! Không có thông báo mới nào.',
+    'how_to_import_data' => 'Làm thế nào đến nhập dữ liệu',
+    'download_example_file' => 'Tải xuống tệp ví dụ',
 );
 
 return $lang;