From fe96d826ef19d581808a0ba03f9eab9947977a19 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 15 Jul 2025 21:49:28 +0200 Subject: [PATCH 1/4] Avoid duplicate apt install --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 597b7ee4d4f..5af797c5fef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,9 +78,6 @@ before_install: if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 fi - if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then - sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1 - fi if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1 fi From 6641e00cd67c5b58c2e558963135afe6d327509f Mon Sep 17 00:00:00 2001 From: atm-adrien <67913809+atm-adrien@users.noreply.github.com> Date: Sat, 19 Jul 2025 00:29:55 +0200 Subject: [PATCH 2/4] FIX : Correct rank when adding line on order (#34764) * FIX : Correct rank when adding line on order * FIX : Delete TODO --- htdocs/commande/class/commande.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 3d8a670b693..f261ecea741 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1693,9 +1693,12 @@ class Commande extends CommonOrder if (!empty($fk_parent_line)) { $this->line_order(true, 'DESC'); } elseif ($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines - $linecount = count($this->lines); - for ($ii = $ranktouse; $ii <= $linecount; $ii++) { - $this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1); + foreach ($this->lines as $line) { + if ($line->rang >= $ranktouse) { + if (!empty($line->id)) { + $this->updateRangOfLine($line->id, $line->rang + 1); + } + } } } From 3c1b5846c90b45c19d19194829c39abf8a1fd46d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 22 Jul 2025 12:08:51 +0200 Subject: [PATCH 3/4] Fix travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96aac710de6..36f1136d6e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -208,8 +208,8 @@ before_script: phpcs -i | head - # Check PHP Vardump check version echo "PHP Vardump check version" - which var-dump-check - var-dump-check --version + which var-dump-check + var-dump-check --version # Check PHPUnit version echo "PHPUnit version" which phpunit From bc33f7e1a7fdbdf5535d7ac4e146a4647ad35100 Mon Sep 17 00:00:00 2001 From: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com> Date: Tue, 22 Jul 2025 12:10:41 +0200 Subject: [PATCH 4/4] FIX 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777) --- htdocs/compta/facture/class/facture.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4a10e111f71..3f42160dfd1 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1255,6 +1255,7 @@ class Facture extends CommonInvoice $object->user_valid = null; // deprecated $object->fk_user_author = $user->id; $object->fk_user_valid = null; + $object->fk_fac_rec_source = null; $object->fk_facture_source = 0; $object->date_creation = ''; $object->date_modification = '';