From dd1d7121a83224ad6a18d52de5a351260d3323f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Feb 2019 20:36:08 +0100 Subject: [PATCH 1/3] remove dead code in /societe/contact.php --- htdocs/societe/contact.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php index 62ba944eabb..a49500d930b 100644 --- a/htdocs/societe/contact.php +++ b/htdocs/societe/contact.php @@ -163,12 +163,6 @@ if ($action != 'presend') { $result=show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); } - - // Addresses list - if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) - { - $result=show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); - } } // End of page From b6d665a91c884f56d50710e6dfa3c28d914baeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Feb 2019 20:38:21 +0100 Subject: [PATCH 2/3] Update card.php --- htdocs/fourn/card.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index ec99653cec7..3cb2e585db6 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -862,12 +862,6 @@ if ($object->id > 0) show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); } - // Addresses list - if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB)) - { - $result=show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); - } - if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) { print load_fiche_titre($langs->trans("ActionsOnCompany"), '', ''); From 7886b5900c63537fbb68a988452a6ccd95765031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Feb 2019 20:40:03 +0100 Subject: [PATCH 3/3] Update card.php --- htdocs/comm/card.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index a30bbf5e4b4..9e319d70f91 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -7,8 +7,9 @@ * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Alexandre Spangaro - * Copyright (C) 2015 Frederic France + * Copyright (C) 2015-2019 Frédéric France * Copyright (C) 2015 Marcos García + * * 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 * the Free Software Foundation; either version 3 of the License, or @@ -1327,12 +1328,6 @@ if ($object->id > 0) show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); } - // Addresses list - if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB)) - { - show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id); - } - if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB)) { print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');