From e8bdb580ab4a74319c0fae867d20e3d9ce368055 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 29 Nov 2018 14:00:27 +0100 Subject: [PATCH 1/3] Fix trans --- htdocs/public/payment/newpayment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index ed1e0502020..9e9ee8d4fc7 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -1464,7 +1464,7 @@ if ($source == 'donation') // Debitor - print ''.$langs->trans("Member"); + print ''.$langs->trans("ThirdParty"); print ''; if ($don->morphy == 'mor' && ! empty($don->societe)) print $don->societe; else print $don->getFullName($langs); From ad7117be609957b927b66af35e510692b5b9eeea Mon Sep 17 00:00:00 2001 From: Inovea Conseil Date: Fri, 30 Nov 2018 15:05:28 +0100 Subject: [PATCH 2/3] FIX mass action closed proposal --- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/comm/propal/list.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 0fcdcd47546..c9fc85f32e8 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2432,7 +2432,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @return int <0 if KO, >0 if OK */ - function cloture($user, $statut, $note, $notrigger=0) + function cloture($user, $statut, $note="", $notrigger=0) { global $langs,$conf; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index be8bddedfa4..98ff1c45194 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -466,7 +466,7 @@ if ($resql) 'builddoc'=>$langs->trans("PDFMerge"), ); if ($user->rights->propal->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete"); - if ($user->rights->propal->cloturer) $arrayofmassactions['closed']=$langs->trans("Closed"); + if ($user->rights->propal->cloturer) $arrayofmassactions['closed']=$langs->trans("Close"); if (in_array($massaction, array('presend','predelete','closed'))) $arrayofmassactions=array(); $massactionbutton=$form->selectMassAction('', $arrayofmassactions); From 6201962dcfddf671a618931e68897ab5e4a44de3 Mon Sep 17 00:00:00 2001 From: Inovea Conseil Date: Fri, 30 Nov 2018 23:27:05 +0100 Subject: [PATCH 3/3] Fix missing translation --- htdocs/langs/en_US/banks.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 7650613341e..37a1d03a2d3 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -164,3 +164,5 @@ AddVariousPayment=Add miscellaneous payments SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to +BankAccountReleveModule=Module Bank statement +AutoReportLastAccountStatement=Automatic report account stament