shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brkcvn/akaunting into show-loading

Browse Source
This commit is contained in:
Burak Civan
2022-10-12 14:47:22 +03:00
parent 314e9dd308 73918e3caa
commit 2dbc815073
8 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/plugins/form.js vendored
View File

@ -478,9 +478,12 @@ export default class Form {
if (response.data.redirect) {
this.loading = true;
// Empty hash because /sale/customer/1#transaction redirect to sale/invoice/create.
window.location.hash = '';
window.location.href = response.data.redirect;
if (window.location.hash !== undefined) {
if (typeof window.location.hash != "undefined" && window.location.hash.length) {
location.reload();
}
}

1
resources/lang/es-CO/auth.php
View File

@ -39,6 +39,7 @@ return [
'error' => [
'self_delete' => 'Error: Cuenta actual!',
'self_disable' => 'error: deshabilitado',
'unassigned' => 'Error: Can not unassigned company! The :company company must be assigned at least one user.',
'no_company' => 'Error: No hay compañías asignadas a su cuenta. Por favor contacte al administrador del sistema.',
],

1
resources/lang/fr-FR/auth.php
View File

@ -39,6 +39,7 @@ return [
'error' => [
'self_delete' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !',
'self_disable' => 'Erreur : Vous ne pouvez pas vous désactiver vous-même !',
'unassigned' => 'Erreur: La société :company ne peut pas être désassignée ! La société :company doit être assignée au moins un utilisateur.',
'no_company' => 'Erreur : Aucune entreprise associée à votre compte. Veuillez contacter votre administrateur système.',
],

2
resources/lang/fr-FR/widgets.php
View File

@ -12,7 +12,7 @@ return [
'currencies' => 'Devises',
'view_report' => 'Voir le rapport',
'total_unpaid_invoices' => 'Montant des factures impayées',
'total_unpaid_invoices' => 'Montant total des factures impayées',
'total_unpaid_bills' => 'Montant des achats impayés',
'description' => [

10
resources/lang/id-ID/currencies.php
View File

@ -14,6 +14,14 @@ return [
'position' => 'Posisi Simbol',
'before' => 'Sebelum Jumlah',
'after' => 'Setelah Jumlah',
]
],
'form_description' => [
'general' => 'Mata uang bawaan saat ini digunakan pada Dasbor dan Laporan. Bagi mata uang yang lain, nilai tukar harus lebih rendah dari 1 untuk mata uang yang lebih lemah dan lebih dari 1 untuk mata uang yang lebih kuat.',
],
'no_currency' => 'Tanpa Mata Uang',
'create_currency' => 'Buat mata uang baru dan edit kapan saja melalui pengaturan.',
'new_currency' => 'Mata Uang Baru',
];

1
resources/lang/pt-BR/auth.php
View File

@ -39,6 +39,7 @@ return [
'error' => [
'self_delete' => 'Erro: não pode se excluir!',
'self_disable' => 'Erro: Você não pode desativar você mesmo!',
'unassigned' => 'Erro: não pode deixar de ser atribuído empresa! A :company deve ser atribuída pelo menos um usuário.',
'no_company' => 'Erro: Nenhuma empresa atribuída à sua conta. Por favor, entre em contato com o administrador do sistema.',
],