diff --git a/.travis.yml b/.travis.yml index b03fb3458c2..fa0fadfa608 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ jobs: - stage: PHP min and max if: type = push php: '7.1' - env: + env: - DB=postgresql - TRAVIS_PHP_VERSION=7.1 - stage: PHP min and max @@ -49,7 +49,7 @@ jobs: - stage: PHP 8.3 if: type = push AND branch = develop php: '8.3' - env: + env: - DB=mysql - TRAVIS_PHP_VERSION=8.3 @@ -89,7 +89,7 @@ before_install: if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3 fi - + - | echo Install pgsql if run is for pgsql if [ "$DB" = 'postgresql' ]; then @@ -116,15 +116,15 @@ install: - | if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo update-alternatives --set php /usr/bin/php7.1 - fi + fi if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo update-alternatives --set php /usr/bin/php8.1 - fi + fi if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then sudo update-alternatives --set php /usr/bin/php8.2 - fi + fi php -i | head - - + - | echo "Updating Composer config" curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php @@ -133,7 +133,7 @@ install: php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer sudo chmod -R a+rwx /usr/local/bin/composer - + #sudo apt install composer composer -V sudo composer -n config -g vendor-dir htdocs/includes @@ -230,7 +230,7 @@ before_script: #sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa & sleep 3 - sudo ps fauxww + sudo ps fauxww echo "MySQL set root password" sudo mysql -u root -h 127.0.0.1 -e "FLUSH PRIVILEGES; CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8'; ALTER USER 'root'@'localhost' IDENTIFIED BY 'password'; CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'password'; CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON travis.* TO root@127.0.0.1; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;" echo "MySQL grant" @@ -239,7 +239,7 @@ before_script: sudo mysql -u root -h 127.0.0.1 -ppassword -e 'use mysql; select * from user;' echo "List pid file" sudo mysql -u root -h 127.0.0.1 -ppassword -e "show variables like '%pid%';" - + #sudo kill `cat /var/lib/mysqld/mysqld.pid` #sudo systemctl start mariadb @@ -247,7 +247,7 @@ before_script: sudo mysql -u root -h 127.0.0.1 -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' echo "MySQL flush" sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES;' - + echo "MySQL load sql" sudo mysql -u root -h 127.0.0.1 -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql fi @@ -416,12 +416,12 @@ script: echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE #cat $INSTALL_FORCED_FILE echo - + - | echo "Upgrading Dolibarr" # Ensure we catch errors with -e. Set this to +e if you want to go to the end to see log files. # Note: We keep +e because with pgsql, one of upgrade process fails even if migration seems ok, so - # I disable stop on error to be able to continue. + # I disable stop on error to be able to continue. set +e cd htdocs/install php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b5937495443..0d9239aac8e 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -391,6 +391,7 @@ class CommandeFournisseur extends CommonOrder $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_label, cr.libelle_facture as cond_reglement_doc,"; $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle"; $sql .= ', c.fk_incoterms, c.location_incoterms'; + $sql .= ', c.last_main_doc'; $sql .= ', i.libelle as label_incoterms'; $sql .= " FROM ".$this->db->prefix()."commande_fournisseur as c"; $sql .= " LEFT JOIN ".$this->db->prefix()."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid"; @@ -428,6 +429,7 @@ class CommandeFournisseur extends CommonOrder $this->statut = $obj->status; // deprecated $this->status = $obj->status; $this->billed = $obj->billed; + $this->last_main_doc = $obj->last_main_doc; $this->user_author_id = $obj->user_author_id; $this->user_validation_id = $obj->user_validation_id; $this->user_approve_id = $obj->user_approve_id; diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index ae3818239c4..cf0dd614080 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -1209,6 +1209,7 @@ class SupplierProposal extends CommonObject $sql .= ", p.fk_mode_reglement"; $sql .= ', p.fk_account'; $sql .= ", p.fk_shipping_method"; + $sql .= ", p.last_main_doc"; $sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc"; $sql .= ", c.label as statut_label"; $sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc"; @@ -1255,6 +1256,7 @@ class SupplierProposal extends CommonObject $this->delivery_date = $this->db->jdate($obj->delivery_date); $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null; + $this->last_main_doc = $obj->last_main_doc; $this->mode_reglement_id = $obj->fk_mode_reglement; $this->mode_reglement_code = $obj->mode_reglement_code; $this->mode_reglement = $obj->mode_reglement;