From d976d474df10bfd4aa39e62d97fde537b49ebb5f Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 2 Oct 2020 08:42:48 +0200 Subject: [PATCH 1/3] NEW Hook on propal card --- htdocs/comm/propal/card.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 8febd8868e9..312a4865a22 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -13,6 +13,7 @@ * Copyright (C) 2014 Ferran Marcet * Copyright (C) 2016 Marcos García * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2020 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 @@ -2368,6 +2369,10 @@ if ($action == 'create') $parameters = array(); $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + }else + { + $parameters = array(); + $reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook } } From 4707ea2a27653b6df1464b9cf06e7a73cf862bb8 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 2 Oct 2020 06:48:14 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/comm/propal/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 312a4865a22..536754214e4 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2369,8 +2369,7 @@ if ($action == 'create') $parameters = array(); $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - }else - { + }else { $parameters = array(); $reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook } From d297e0b05ab6b4d60aa742514ca4cf69b5763d91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Oct 2020 13:46:44 +0200 Subject: [PATCH 3/3] Update card.php --- htdocs/comm/propal/card.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 536754214e4..9caf2c8483c 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2362,14 +2362,13 @@ if ($action == 'create') // Form to add new line if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') { - if ($action != 'editline') - { + if ($action != 'editline') { // Add products/services form $object->formAddObjectLine(1, $mysoc, $soc); $parameters = array(); $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - }else { + } else { $parameters = array(); $reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook }