diff --git a/VERSION.txt b/VERSION.txt
index 9b455dc8badd..b0c32105423b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.110
\ No newline at end of file
+5.5.111
\ No newline at end of file
diff --git a/app/Console/Commands/MobileLocalization.php b/app/Console/Commands/MobileLocalization.php
index 482cf9042ade..e4d12c98bc33 100644
--- a/app/Console/Commands/MobileLocalization.php
+++ b/app/Console/Commands/MobileLocalization.php
@@ -93,6 +93,17 @@ class MobileLocalization extends Command
$text = str_replace(['', ''], '', $text);
$text = str_replace(['', ''], '', $text);
+//replace the three lines above with this
+// if($language->locale == 'ar') {
+// $text = str_replace('\n', " ", $text);
+// }
+
+// $text = str_replace(['', '','', '','', ''], '', $text);
+// $text = str_replace('"', "'", $text);
+
+
+
+
echo "'$key': '$text',\n";
}
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 97d9941e2d94..7eb5f80e1eea 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -71,16 +71,12 @@ use Laracasts\Presenter\PresentableTrait;
* @property int $account_sms_verified
* @property string|null $bank_integration_account_id
* @property int $is_trial
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
* @property-read int|null $bank_integrations_count
- * @property-read \Illuminate\Database\Eloquent\Collection $companies
* @property-read int|null $companies_count
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
* @property-read int|null $company_users_count
* @property-read \App\Models\Company|null $default_company
* @property-read mixed $hashed_id
* @property-read \App\Models\Payment|null $payment
- * @property-read \Illuminate\Database\Eloquent\Collection $users
* @property-read int|null $users_count
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel company()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns)
@@ -131,6 +127,7 @@ use Laracasts\Presenter\PresentableTrait;
* @method static \Illuminate\Database\Eloquent\Builder|Account whereUtmSource($value)
* @method static \Illuminate\Database\Eloquent\Builder|Account whereUtmTerm($value)
* @method static \Illuminate\Database\Eloquent\Builder|Account first()
+ * @method static \Illuminate\Database\Eloquent\Builder|Account with()
* @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
* @property-read \Illuminate\Database\Eloquent\Collection $companies
* @property-read \Illuminate\Database\Eloquent\Collection $company_users
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 40dd21aef776..35b0ca524071 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -104,6 +104,7 @@ use Laracasts\Presenter\PresentableTrait;
* @property int $convert_expense_currency
* @property int $notify_vendor_when_paid
* @property int $invoice_task_hours
+ * @property int $deleted_at
* @property-read \App\Models\Account $account
* @property-read \Illuminate\Database\Eloquent\Collection $activities
* @property-read int|null $activities_count
@@ -327,498 +328,6 @@ use Laracasts\Presenter\PresentableTrait;
* @property-read \Illuminate\Database\Eloquent\Collection $webhooks
* @property int $calculate_taxes
* @property mixed $tax_data
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders
- * @property-read \Illuminate\Database\Eloquent\Collection $quotes
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions
- * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation
- * @property-read \Illuminate\Database\Eloquent\Collection $system_logs
- * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses
- * @property-read \Illuminate\Database\Eloquent\Collection $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed
- * @property-read \Illuminate\Database\Eloquent\Collection $user_designs
- * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $users
- * @property-read \Illuminate\Database\Eloquent\Collection $vendors
- * @property-read \Illuminate\Database\Eloquent\Collection $webhooks
- * @method static \Illuminate\Database\Eloquent\Builder|Company whereCalculateTaxes($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Company whereTaxAllProducts($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Company whereTaxData($value)
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders
- * @property-read \Illuminate\Database\Eloquent\Collection $quotes
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions
- * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation
- * @property-read \Illuminate\Database\Eloquent\Collection $system_logs
- * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses
- * @property-read \Illuminate\Database\Eloquent\Collection $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed
- * @property-read \Illuminate\Database\Eloquent\Collection $user_designs
- * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $users
- * @property-read \Illuminate\Database\Eloquent\Collection $vendors
- * @property-read \Illuminate\Database\Eloquent\Collection $webhooks
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders
- * @property-read \Illuminate\Database\Eloquent\Collection $quotes
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions
- * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation
- * @property-read \Illuminate\Database\Eloquent\Collection $system_logs
- * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses
- * @property-read \Illuminate\Database\Eloquent\Collection $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed
- * @property-read \Illuminate\Database\Eloquent\Collection $user_designs
- * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $users
- * @property-read \Illuminate\Database\Eloquent\Collection $vendors
- * @property-read \Illuminate\Database\Eloquent\Collection $webhooks
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders
- * @property-read \Illuminate\Database\Eloquent\Collection $quotes
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions
- * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation
- * @property-read \Illuminate\Database\Eloquent\Collection $system_logs
- * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses
- * @property-read \Illuminate\Database\Eloquent\Collection $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed
- * @property-read \Illuminate\Database\Eloquent\Collection $user_designs
- * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $users
- * @property-read \Illuminate\Database\Eloquent\Collection $vendors
- * @property-read \Illuminate\Database\Eloquent\Collection $webhooks
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders
- * @property-read \Illuminate\Database\Eloquent\Collection $quotes
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions
- * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation
- * @property-read \Illuminate\Database\Eloquent\Collection $system_logs
- * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers
- * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses
- * @property-read \Illuminate\Database\Eloquent\Collection $tasks
- * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed
- * @property-read \Illuminate\Database\Eloquent\Collection $user_designs
- * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $users
- * @property-read \Illuminate\Database\Eloquent\Collection $vendors
- * @property-read \Illuminate\Database\Eloquent\Collection $webhooks
- * @property-read \Illuminate\Database\Eloquent\Collection $activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_activities
- * @property-read \Illuminate\Database\Eloquent\Collection $all_documents
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules
- * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions
- * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens
- * @property-read \Illuminate\Database\Eloquent\Collection $clients
- * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways
- * @property-read \Illuminate\Database\Eloquent\Collection $company_users
- * @property-read \Illuminate\Database\Eloquent\Collection $contacts
- * @property-read \Illuminate\Database\Eloquent\Collection $credits
- * @property-read \Illuminate\Database\Eloquent\Collection $designs
- * @property-read \Illuminate\Database\Eloquent\Collection $documents
- * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories
- * @property-read \Illuminate\Database\Eloquent\Collection $expenses
- * @property-read \Illuminate\Database\Eloquent\Collection $group_settings
- * @property-read \Illuminate\Database\Eloquent\Collection $groups
- * @property-read \Illuminate\Database\Eloquent\Collection $invoices
- * @property-read \Illuminate\Database\Eloquent\Collection $ledger
- * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms
- * @property-read \Illuminate\Database\Eloquent\Collection $payments
- * @property-read \Illuminate\Database\Eloquent\Collection $products
- * @property-read \Illuminate\Database\Eloquent\Collection $projects
- * @property-read \Illuminate\Database\Eloquent\Collection