From 6ba6258d1457840435a6233221d3a480d7367d86 Mon Sep 17 00:00:00 2001 From: Mavyre Date: Tue, 29 May 2018 17:36:24 +0200 Subject: [PATCH 1/3] Fixed Classify abandonned not displaying --- htdocs/don/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 46f223d3857..5a9e439a9c7 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -730,7 +730,7 @@ if (! empty($id) && $action != 'edit') print '
'.$langs->trans("ValidPromess").'
'; } - if (($object->statut == 0 || $object->statut == 1) && $remaintopay == 0 && $object->paid == 0) + if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0) { print '
'.$langs->trans("ClassifyCanceled")."
"; } From 52a9c787bbb3a975775d1df6ea31ffcc8e5fdca4 Mon Sep 17 00:00:00 2001 From: rassakali Date: Tue, 29 May 2018 21:00:46 +0200 Subject: [PATCH 2/3] Update card.php Fix #5606 --- htdocs/don/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 46f223d3857..3b0ea678085 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -730,7 +730,7 @@ if (! empty($id) && $action != 'edit') print ''; } - if (($object->statut == 0 || $object->statut == 1) && $remaintopay == 0 && $object->paid == 0) + if (($object->statut == 0 || $object->statut == 1) && totalpaid == 0 && $object->paid == 0) { print '"; } From fc7b88e5e6e77182e6c06aea2818ed37fae6c954 Mon Sep 17 00:00:00 2001 From: Inovea Conseil Date: Tue, 29 May 2018 23:04:35 +0200 Subject: [PATCH 3/3] Fix missing substitution Missing substitution for object --- htdocs/modulebuilder/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index c46d76ce4ba..e844793b601 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2018 Nicolas ZABOURI * * 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 @@ -398,7 +399,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) 'Mon module'=>$module, 'htdocs/modulebuilder/template/'=>strtolower($modulename), 'myobject'=>strtolower($objectname), - 'MyObject'=>$objectname + 'MyObject'=>$objectname, + 'MYOBJECT'=>strtoupper($objectname) ); $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);