From 075d2c3dedb081ba19e6e615630a38d4754c54fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 17:58:59 +0100 Subject: [PATCH 1/6] remove deprecated --- htdocs/comm/propal/card.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index e823ec95cdc..ba78c711dcc 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -12,7 +12,7 @@ * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Ferran Marcet * Copyright (C) 2016 Marcos García - * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2018-2021 Frédéric France * Copyright (C) 2020 Nicolas ZABOURI * * This program is free software; you can redistribute it and/or modify @@ -1557,12 +1557,11 @@ if ($action == 'create') } print ''."\n"; - if ($socid > 0) - { + if ($socid > 0) { // Contacts (ask contact only if thirdparty already defined). print "".$langs->trans("DefaultContact").''; print img_picto('', 'contact'); - $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); + $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); print ''; // Third party discounts info line @@ -1612,8 +1611,9 @@ if ($action == 'create') // Delivery delay print ''.$langs->trans('AvailabilityPeriod'); - if (!empty($conf->commande->enabled)) + if (!empty($conf->commande->enabled)) { print ' ('.$langs->trans('AfterOrder').')'; + } print ''; print img_picto('', 'clock').' '; $form->selectAvailabilityDelay('', 'availability_id', '', 1); From fb4aea8223b1d98ecfc247a0c27efd91cd51bd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 18:02:41 +0100 Subject: [PATCH 2/6] Update card.php --- htdocs/commande/card.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index f6b3a1b3fa4..36dd3e03a99 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -12,7 +12,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Ferran Marcet * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2018 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 @@ -1603,7 +1603,7 @@ if ($action == 'create' && $usercancreate) // Contacts (ask contact only if thirdparty already defined). print "".$langs->trans("DefaultContact").''; print img_picto('', 'contact'); - $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1); + $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1); print ''; // Ligne info remises tiers @@ -1644,8 +1644,7 @@ if ($action == 'create' && $usercancreate) print ''; // Bank Account - if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled)) - { + if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled)) { print ''.$langs->trans('BankAccount').''; print img_picto('', 'bank_account'); $form->select_comptes($fk_account, 'fk_account', 0, '', 1); From 2c6656b2ad99a916d9d0ccee4716765ef4d4cc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 18:07:21 +0100 Subject: [PATCH 3/6] Update card.php --- htdocs/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 36dd3e03a99..f7cc3e7af47 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1603,7 +1603,7 @@ if ($action == 'create' && $usercancreate) // Contacts (ask contact only if thirdparty already defined). print "".$langs->trans("DefaultContact").''; print img_picto('', 'contact'); - $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1); + print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1); print ''; // Ligne info remises tiers From aecb185c8d1d1fb8b0e7e134ce0584c5e50a256c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 18:07:58 +0100 Subject: [PATCH 4/6] Update card.php --- htdocs/comm/propal/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index ba78c711dcc..da97b627858 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1561,7 +1561,7 @@ if ($action == 'create') // Contacts (ask contact only if thirdparty already defined). print "".$langs->trans("DefaultContact").''; print img_picto('', 'contact'); - $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); + print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); print ''; // Third party discounts info line From da8c80071f4f61be024014465063e96a0074fb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 18:09:35 +0100 Subject: [PATCH 5/6] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4284b009019..f97ca3ca95b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1479,7 +1479,7 @@ class Form if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0"; $sql .= " ORDER BY sp.lastname ASC"; - dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG); + dol_syslog(get_class($this)."::selectcontacts", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { From f8dd1a7fc73a9a6e22f6421e755424c5aded371f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Feb 2021 22:00:54 +0100 Subject: [PATCH 6/6] Update list.php --- htdocs/projet/list.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index b8ab088cf85..b6fee6adf7a 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -563,11 +563,10 @@ if (!empty($arrayfields['p.title']['checked'])) if (!empty($arrayfields['s.nom']['checked'])) { print ''; - if ($socid > 0) - { + if ($socid > 0) { $tmpthirdparty = new Societe($db); $tmpthirdparty->fetch($socid); - $search_societe = $tmpthirdparty->nom; + $search_societe = $tmpthirdparty->name; } print ''; print '';