From 7b8d4c26566e0d557f4de0d46f6d85e982637d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 6 May 2021 20:32:41 +0200 Subject: [PATCH 1/3] phpcs --- htdocs/admin/mails_templates.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 68e579697d3..c2a54e31a3a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -11,7 +11,7 @@ * Copyright (C) 2011-2016 Alexandre Spangaro * Copyright (C) 2015 Ferran Marcet * Copyright (C) 2016 Raphaël Doursenaud - * Copyright (C) 2018-2020 Frédéric France + * Copyright (C) 2018-2021 Frédéric France * * 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 @@ -339,7 +339,7 @@ if (empty($reshook)) { $sql = "INSERT INTO ".$tabname[$id]." ("; // List of fields $sql .= $tabfieldinsert[$id]; - $sql .= ", active, enabled)"; + $sql .= ", active, enabled)"; $sql .= " VALUES("; // List of values From 7897469963fd897a12c592c67318a90f0b8e8cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 6 May 2021 20:34:45 +0200 Subject: [PATCH 2/3] Update account.class.php --- htdocs/compta/bank/class/account.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 0a094a8ab7b..8c29a9ffc36 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1693,8 +1693,7 @@ class Account extends CommonObject { $sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'"; - if (!$db->query($sql)) - { + if (!$db->query($sql)) { //if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B. //$this->errors = $db->lasterror(); return false; From 4ef53234f12bfeeeb2b83e1e79fb0badb74ae4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 6 May 2021 20:39:36 +0200 Subject: [PATCH 3/3] Update partnership.class.php --- htdocs/partnership/class/partnership.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php index a42e12fd412..8b3c9b8240a 100644 --- a/htdocs/partnership/class/partnership.class.php +++ b/htdocs/partnership/class/partnership.class.php @@ -119,6 +119,10 @@ class Partnership extends CommonObject public $date_partnership_end; public $count_last_url_check_error; public $last_check_backlink; + + /** + * @var string reason_decline_or_cancel + */ public $reason_decline_or_cancel; // END MODULEBUILDER PROPERTIES @@ -848,9 +852,10 @@ class Partnership extends CommonObject /** * Set refused status * - * @param User $user Object user that modify - * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers - * @return int <0 if KO, 0=Nothing done, >0 if OK + * @param User $user Object user that modify + * @param string $reasondeclinenote Reason decline + * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers + * @return int <0 if KO, 0=Nothing done, >0 if OK */ public function refused($user, $reasondeclinenote = '', $notrigger = 0) {