From cb302fbb631854a1ea60f5e0421313a4defd2136 Mon Sep 17 00:00:00 2001 From: noec764 <58433943+noec764@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:55:07 +0100 Subject: [PATCH 1/4] FIX: Special code is now transmitted by args only in order supplier (#28546) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: NoƩ --- htdocs/fourn/commande/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index c9e5e8f4fee..2c1e723df00 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1350,8 +1350,6 @@ if (empty($reshook)) { $tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id); } - $object->special_code = $lines[$i]->special_code; - $result = $object->addline( $desc, $lines[$i]->subprice, @@ -1374,7 +1372,9 @@ if (empty($reshook)) { $lines[$i]->fk_unit, 0, $element, - !empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid + !empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid, + -1, + $lines[$i]->special_code ); if ($result < 0) { From af8e086aacb29fd366d426b9a87c4693397ead85 Mon Sep 17 00:00:00 2001 From: Liammer <104431491+Liammer@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:24:31 +0100 Subject: [PATCH 2/4] Update adherent.class.php (#28554) To not send the Email to cancelled members. They already asked not to be members anymore. Sending reminders can be exhausting. --- htdocs/adherents/class/adherent.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 8717ecd010a..25fa2b6a257 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -3102,6 +3102,7 @@ class Adherent extends CommonObject $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'adherent'; $sql .= " WHERE entity = ".((int) $conf->entity); // Do not use getEntity('adherent').")" here, we want the batch to be on its entity only; + $sql .= " AND statut = 1"; $sql .= " AND datefin = '".$this->db->idate($datetosearchfor)."'"; //$sql .= " LIMIT 10000"; From 3c28480fda5f1c39a78ff5a3f6dccb3e6aa8fd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne=20Benke?= <1179011+defrance@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:26:36 +0100 Subject: [PATCH 3/4] Update list.php add some init field array (#28550) --- htdocs/compta/facture/list.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 6a089f7a87d..a6fa25cfd13 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1821,6 +1821,9 @@ if ($resql) { $totalarray['val']['f.total_tva'] = 0; $totalarray['val']['f.total_ht'] = 0; $totalarray['val']['f.total_ttc'] = 0; + $totalarray['val']['totalam'] = 0; + $totalarray['val']['rtp'] = 0; + $with_margin_info = false; if (isModEnabled('margin') && ( From 9ab1f56f834c6b6edb308b2ad6d63067101a16b3 Mon Sep 17 00:00:00 2001 From: Delthair <41671350+Delthair@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:49:37 +0100 Subject: [PATCH 4/4] Update expensereport.lib.php (#28553) ISSUE #28552 --- htdocs/core/lib/expensereport.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php index ae9ca936c47..58401b4cc59 100644 --- a/htdocs/core/lib/expensereport.lib.php +++ b/htdocs/core/lib/expensereport.lib.php @@ -81,7 +81,7 @@ function expensereport_prepare_head($object) $head[$h][2] = 'info'; $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'add', 'external'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'add', 'external'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');