From 49a1e33fc9b5df2c5297b3e10de6e977ef697ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 1 Sep 2018 16:23:30 +0200 Subject: [PATCH 1/3] Update html_cerfafr.modules.php --- htdocs/core/modules/dons/html_cerfafr.modules.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index c7f741e3022..8a22babea18 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -287,8 +287,11 @@ class html_cerfafr extends ModeleDon * @param mixed $devise2 devise 2 ex: centimes * @return string amount in letters */ -function amountToLetters($montant, $devise1='', $devise2='') +private function amountToLetters($montant, $devise1='', $devise2='') { + $unite = array(); + $dix = array(); + $cent = array(); if(empty($devise1)) $dev1='euros'; else $dev1=$devise1; if(empty($devise2)) $dev2='centimes'; From 71977514d784a440ef0e83262b30092530324572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 2 Sep 2018 09:06:51 +0200 Subject: [PATCH 2/3] Update actioncommreminder.class.php --- .../action/class/actioncommreminder.class.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php index ca1a97c5406..f797269a2e4 100644 --- a/htdocs/comm/action/class/actioncommreminder.class.php +++ b/htdocs/comm/action/class/actioncommreminder.class.php @@ -180,38 +180,32 @@ class ActionCommReminder extends CommonObject { global $langs; - if ($mode == 0) - { - $prefix=''; - if ($status == 1) return $langs->trans('Done'); - if ($status == 0) return $langs->trans('ToDo'); - } - if ($mode == 1) + if ($mode == 0 || $mode == 1) { if ($status == 1) return $langs->trans('Done'); if ($status == 0) return $langs->trans('ToDo'); } - if ($mode == 2) + elseif ($mode == 2) { if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done'); if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo'); } - if ($mode == 3) + elseif ($mode == 3) { if ($status == 1) return img_picto($langs->trans('Done'),'statut4'); if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5'); } - if ($mode == 4) + elseif ($mode == 4) { if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done'); if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo'); } - if ($mode == 5) + elseif ($mode == 5) { if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4'); if ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5'); } - if ($mode == 6) + elseif ($mode == 6) { if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4'); if ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5'); From 0c16761f483ab16552d4e03fdf4e3bb255ffb47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 2 Sep 2018 10:23:00 +0200 Subject: [PATCH 3/3] Update myobject.class.php --- .../template/class/myobject.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index 78834332613..21e8df59efc 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -390,31 +390,31 @@ class MyObject extends CommonObject { return $this->labelstatus[$status]; } - if ($mode == 1) + elseif ($mode == 1) { return $this->labelstatus[$status]; } - if ($mode == 2) + elseif ($mode == 2) { if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status]; if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status]; } - if ($mode == 3) + elseif ($mode == 3) { if ($status == 1) return img_picto($this->labelstatus[$status],'statut4'); if ($status == 0) return img_picto($this->labelstatus[$status],'statut5'); } - if ($mode == 4) + elseif ($mode == 4) { if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status]; if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status]; } - if ($mode == 5) + elseif ($mode == 5) { if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4'); if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5'); } - if ($mode == 6) + elseif ($mode == 6) { if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4'); if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5'); @@ -531,4 +531,4 @@ class MyObjectLine // @var mixed Sample line property 2 public $prop2; } -*/ \ No newline at end of file +*/