From 4059b6428804f5c63c4e8d94beb778230f1d9dee Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:00:25 +0200 Subject: [PATCH] FIX: deposit payment terms: langs --- htdocs/comm/propal/card.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/langs/en_US/bills.lang | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index c0c3e79e0a9..c197ee43c8e 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2018,7 +2018,7 @@ if ($action == 'create') { 'type' => 'checkbox', 'tdclass' => 'showonlyifsigned', 'name' => 'generate_deposit', - 'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('PaymentConditionPermitsDepositGenerationSelected')) + 'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected')) ); $formquestion[] = array( diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 57469c08c00..31a67d5ebfa 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2028,7 +2028,7 @@ if ($action == 'create' && $usercancreate) { 'type' => 'checkbox', 'tdclass' => '', 'name' => 'generate_deposit', - 'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('PaymentConditionPermitsDepositGenerationSelected')) + 'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected')) ); $formquestion[] = array( diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 9e65add59ce..5efe95f61bd 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1423,7 +1423,7 @@ class Facture extends CommonInvoice global $conf, $langs, $hookmanager, $action; if (! in_array($origin->element, array('propal', 'commande'))) { - $origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder'; // TRAD + $origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder'; return null; } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 429e46b0d69..58dea88bbc1 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -426,7 +426,7 @@ VarAmount=Variable amount (%% tot.) VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s' VarAmountAllLines=Variable amount (%% tot.) - all lines from origin DepositPercent=Deposit %% -PaymentConditionPermitsDepositGenerationSelected=You can generate a deposit invoice with the payment conditions you selected +DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected GenerateDeposit=Generate a %s%% deposit invoice ValidateGeneratedDeposit=Validate the generated deposit DepositGenerated=Deposit generated