diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 8a8335b30fe..ffe75df1c81 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -55,7 +55,7 @@ $AdherentsResilies=array(); $AdherentType=array(); -// Liste les adherents +// Members list $sql = "SELECT t.rowid, t.libelle as label, t.subscription,"; $sql.= " d.statut, count(d.rowid) as somme"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t"; @@ -92,7 +92,7 @@ if ($result) $now=dol_now(); -// List members up to date +// Members up to date list // current rule: uptodate = the end date is in future whatever is type // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future) $sql = "SELECT count(*) as somme , d.fk_adherent_type"; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index fe15141c86c..cd172888a28 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -7,6 +7,7 @@ * Copyright (C) 2014-2018 Ferran Marcet * Copyright (C) 2014-2018 Charlene Benke * Copyright (C) 2015-2016 Abbes Bahfir + * Copyright (C) 2018 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1646,10 +1647,12 @@ else if ($id > 0 || ! empty($ref)) else print ''; } - // create interventional model + // create intervention model if ($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) { print ''; } diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 604d51c41b9..a130367b14f 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -4,6 +4,7 @@ Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention AddIntervention=Create intervention +ChangeIntoRepeatableIntervention=Change to repeatable intervention ListOfInterventions=List of interventions ActionsOnFicheInter=Actions on intervention LastInterventions=Latest %s interventions