Merge branch 'bp_compat_v19' into 'master'

Dolibarr V19 Compatibility See merge request SplashSync/Dolibarr!3
SplashSync · Feb 21, 2024 · 8f3a73f · 8f3a73f
2 parents 4ac1537 + 3a164d2
commit 8f3a73f
Show file tree

Hide file tree

Showing 21 changed files with 261 additions and 91 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,10 +44,10 @@ variables:
 ################################################################
 # Defined Pipeline Stages
 stages:
-    - quality
-    - basic
-    - advanced
-    - variants
+    - Quality
+    - Basic
+    - Advanced
+    - Variants
     - Builds
 
 ################################################################
@@ -61,8 +61,10 @@ stages:
         - mysql:5.7
     artifacts:
         when: always
+        paths:
+            -       "$CI_PROJECT_DIR/*-report.html"
         reports:
-            junit: "$CI_PROJECT_DIR/*-report.xml"
+            junit:  "$CI_PROJECT_DIR/*-report.xml"
     ################################################################
     # Before Script
     before_script:
@@ -87,31 +89,46 @@ stages:
         # Show PhpUnit Version
         - splash/vendor/phpunit/phpunit/phpunit --version
         # Run PhpUnit Main Local Testsuite
-        - splash/vendor/phpunit/phpunit/phpunit  --testsuite=Init               --log-junit $CI_PROJECT_DIR/init-report.xml
-        - splash/vendor/phpunit/phpunit/phpunit  --testsuite=$PHPUNIT_SUITE     --log-junit $CI_PROJECT_DIR/full-report.xml
+        - splash/vendor/phpunit/phpunit/phpunit  --testsuite=Init               --log-junit $CI_PROJECT_DIR/init-report.xml --testdox-html $CI_PROJECT_DIR/init-report.html
+        - splash/vendor/phpunit/phpunit/phpunit  --testsuite=$PHPUNIT_SUITE     --log-junit $CI_PROJECT_DIR/full-report.xml --testdox-html $CI_PROJECT_DIR/full-report.html
 
 .functionnal-basic:   &functionnal-basic
     <<: *functionnal
-    stage:          basic
+    stage:          Basic
     variables:
         PHPUNIT_SUITE:   Basic
 
 .functionnal-advanced:   &functionnal-advanced
     <<: *functionnal
-    stage:          advanced
+    stage:          Advanced
     variables:
         PHPUNIT_SUITE:   Advanced
 
 .functionnal-variants:   &functionnal-variants
     <<: *functionnal
-    stage:          variants
+    stage:          Variants
     variables:
         PHPUNIT_SUITE:   Variants
 
 ################################################################
 # Functional Tests Map
 ################################################################
 
+################################################################
+# Dolibarr V19
+Dol-19-Basics:
+    image:          tuxgasy/dolibarr:19
+    <<: *functionnal-basic
+    allow_failure: true
+Dol-19-Advanced:
+    image:          tuxgasy/dolibarr:19
+    <<: *functionnal-advanced
+    allow_failure: true
+Dol-19-Variants:
+    image:          tuxgasy/dolibarr:19
+    <<: *functionnal-variants
+    allow_failure: true
+
 ################################################################
 # Dolibarr V18
 Dol-18-Basics:
@@ -199,7 +216,7 @@ Dol-13-Variants:
 ################################################################
 .code_quality:   &code_quality
 #     when:       manual
-    stage:      quality
+    stage:      Quality
     tags:       ['Dedicated']
     services:
         - mysql:5.7
@@ -228,6 +245,11 @@ Dol-13-Variants:
     after_script:
         - curl -s https://raw.githubusercontent.com/BadPixxel/Php-Sdk/main/ci/after.sh | sh
 
+Dol-19-Quality:
+    image:      tuxgasy/dolibarr:19
+    <<: *code_quality
+    allow_failure: true
+
 Dol-18-Quality:
     image:      tuxgasy/dolibarr:18
     <<: *code_quality
@@ -244,16 +266,6 @@ Dol-14-Quality:
     image:      tuxgasy/dolibarr:14
     <<: *code_quality
 
-#Dol-13-Quality:
-#    image:      tuxgasy/dolibarr:13
-#    allow_failure:  true
-#    <<: *code_quality
-#
-#Dol-Dev-Quality:
-#    image:      tuxgasy/dolibarr:develop
-#    allow_failure:  true
-#    <<: *code_quality
-
 ################################################################
 # Build Module
 ################################################################

diff --git a/ci/bootstrap.php b/ci/bootstrap.php
@@ -57,5 +57,6 @@
 // Activate Splash Module
 activateModule("modSplash");
 activateModule("modExpedition");
+activateModule("modProduct");
 activateModule("modProductBatch");
 activateModule("modAccounting");
diff --git a/ci/verify.sh b/ci/verify.sh
@@ -20,7 +20,7 @@ set -e
 
 ################################################################################
 # Docker Compose Container you want to check
-CONTAINERS="dol-18,dol-17,dol-16,dol-14"
+CONTAINERS="dol-19,dol-18,dol-17,dol-16,dol-14"
 WORKDIR="/var/www/html/custom"
 ################################################################################
 # Start Docker Compose Stack

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,7 @@
 # 172.100.0.16        v16.dolibarr.local
 # 172.100.0.17        v17.dolibarr.local
 # 172.100.0.18        v18.dolibarr.local
+# 172.100.0.19        v19.dolibarr.local
 # 172.100.0.99        latest.dolibarr.local
 # 172.100.0.100       toolkit.dolibarr.local
 # 172.100.0.101       db.dolibarr.local
@@ -87,6 +88,36 @@ services:
             dolibarr:      { ipv4_address: 172.100.0.99 }
             splashsync:    { aliases: [ latest.dolibarr.local ] }
 
+    ################################################################################
+    # Dolibarr V19
+    dol-19:
+        image: tuxgasy/dolibarr:19
+        container_name: v19.dolibarr.local
+        depends_on:
+            - mysql
+        links:
+            - mysql
+        working_dir:    /var/www/html/custom
+        environment:
+            - "DOLI_DB_TYPE=mysqli"
+            - "DOLI_DB_HOST=mysql"
+            - "DOLI_DB_NAME=dolibarr19"
+            - "DOLI_DB_USER=root"
+            - "DOLI_DB_PASSWORD=dolibarr"
+            - "DOLI_ADMIN_LOGIN=Admin"
+            - "PHP_MEMORY_LIMIT=-1"
+            - SPLASH_WS_ID=ThisIsDol19Key
+            - SPLASH_WS_KEY=ThisTokenIsNotSoSecretChangeIt
+            - SPLASH_WS_HOST=http://172.100.0.100/ws/soap
+        volumes:
+            - "./:/var/www/html/custom/"
+            - "./.git/:/var/www/html/custom/.git/"
+        entrypoint: sh /var/www/html/custom/docker/docker-entrypoint.sh
+        hostname: v19.dolibarr.local
+        networks:
+            dolibarr:      { ipv4_address: 172.100.0.19 }
+            splashsync:    { aliases: [ v19.dolibarr.local ] }
+
     ################################################################################
     # Dolibarr V18
     dol-18:

diff --git a/docker/toolkit/splash.yaml b/docker/toolkit/splash.yaml
@@ -34,6 +34,21 @@ splash:
                 WsHost:             http://latest.dolibarr.local
                 WsPath:             /custom/splash/vendor/splash/phpcore/soap.php
 
+        ########################################################################
+        # Dolibarr V19
+        dol-19:
+            id:                 ThisIsDol19Key
+            key:                ThisTokenIsNotSoSecretChangeIt
+            name:               Dolibarr 19
+            host:               false
+            connector:          soap
+            config:
+                Extended:           true
+                WsIdentifier:       ThisIsDol19Key
+                WsEncryptionKey:    ThisTokenIsNotSoSecretChangeIt
+                WsHost:             http://v19.dolibarr.local
+                WsPath:             /custom/splash/vendor/splash/phpcore/soap.php
+
         ########################################################################
         # Dolibarr V18
         dol-18:

diff --git a/grumphp.yml b/grumphp.yml
@@ -38,7 +38,7 @@ parameters:
     # For Building Splash Module
     mod-src:            '/splash'
     mod-target:         '/splash/'
-    mod-file:           "module_splash-2.18.1"
+    mod-file:           "module_splash-2.19.0"
 
     # For Building Splash Manifest
     yml-enable:         false

diff --git a/grumphp/phpstan.neon b/grumphp/phpstan.neon
@@ -13,8 +13,7 @@ parameters:
             - ArrayObject
             - FactureStats
             - CommandeStats
-
-    ignoreErrors: 
+    ignoreErrors:
         - '#Function completeFileArrayWithDatabaseInfo not found.#'
 
         # Undefined in Dolibarr Class Property       
@@ -39,4 +38,7 @@ parameters:
         - '#Method ProductCombination2ValuePair::create\(\) invoked with 1 parameter, 0 required#'
 
         # Fix for Dolibarr V18
-        - '#Class EcmfilesLine referenced with incorrect case: EcmFilesLine.#'
+        - '#Class EcmfilesLine referenced with incorrect case: EcmFilesLine.#'
+
+        # Fix for Dolibarr V19
+        - '#Method Commande::load_board\(\) invoked with 2 parameters, 1 required#'
diff --git a/splash/_conf/defines.inc.php b/splash/_conf/defines.inc.php
@@ -32,7 +32,7 @@
 
 //====================================================================//
 // Module Version
-define("SPL_MOD_VERSION", '2.18.1');
+define("SPL_MOD_VERSION", '2.19.0');
 define("SPL_MOD_ID", 9200);
 define("SPL_MOD_NAME", 'splash');
 define("SPL_MOD_CATEGORIE", 'technic');

diff --git a/splash/src/Core/BaseItemsTrait.php b/splash/src/Core/BaseItemsTrait.php
@@ -184,12 +184,12 @@ protected function insertItem(object $item): bool
         $item->total_localtax1 = 0;
         $item->total_localtax2 = 0;
 
-        $item->fk_multicurrency = "";
-        $item->multicurrency_code = "";
-        $item->multicurrency_subprice = "0.0";
-        $item->multicurrency_total_ht = "0.0";
-        $item->multicurrency_total_tva = "0.0";
-        $item->multicurrency_total_ttc = "0.0";
+        $item->fk_multicurrency = 0;
+        $item->multicurrency_code = "0";
+        $item->multicurrency_subprice = 0.0;
+        $item->multicurrency_total_ht = 0.0;
+        $item->multicurrency_total_tva = 0.0;
+        $item->multicurrency_total_ttc = 0.0;
 
         if ($item->insert() <= 0) {
             $this->catchDolibarrErrors($item);
@@ -655,13 +655,18 @@ private function updateItemTotals()
             }
         }
 
+        //====================================================================//
+        // Ensure ThirdParty is Loaded
+        if (!$this->object->thirdparty instanceof \Societe) {
+            $this->object->fetch_thirdparty();
+        }
         //====================================================================//
         // Calcul du total TTC et de la TVA pour la ligne à partir de
         // qty, pu, remise_percent et txtva
         $localTaxType = getLocalTaxesFromRate(
             (string) $vatRateOrId,
             0,
-            $this->object->fetch_thirdparty(),
+            $this->object->thirdparty,
             $mysoc,
             (int) $useId
         );

diff --git a/splash/src/Objects/Address/CRUDTrait.php b/splash/src/Objects/Address/CRUDTrait.php
@@ -17,6 +17,7 @@
 
 use Contact;
 use Splash\Core\SplashCore      as Splash;
+use Splash\Local\Local;
 use Splash\Local\Services\MultiCompany;
 use User;
 
@@ -137,7 +138,7 @@ public function update(bool $needed): ?string
      */
     public function delete(string $objectId): bool
     {
-        global $db,$user;
+        global $db, $user;
         //====================================================================//
         // Stack Trace
         Splash::log()->trace();
@@ -159,8 +160,12 @@ public function delete(string $objectId): bool
             return Splash::log()->err(" Unable to delete Product (".$objectId.").");
         }
         //====================================================================//
+        // Prepare Args
+        $arg1 = (Local::dolVersionCmp("19.0.0") > 0) ? $user : 0;
+        //====================================================================//
         // Delete Object
-        if ($object->delete() <= 0) {
+        /** @phpstan-ignore-next-line */
+        if ($object->delete($arg1) <= 0) {
             return $this->catchDolibarrErrors($object);
         }
 

diff --git a/splash/src/Objects/Invoice/CRUDTrait.php b/splash/src/Objects/Invoice/CRUDTrait.php
@@ -107,8 +107,9 @@ public function create(): ?Facture
         $this->setSimple('date_commande', $dateTime->getTimestamp());
         $this->doCustomerDetection($this->in);
         $this->setSimple("statut", Facture::STATUS_DRAFT);
+        $this->object->fk_user_author = $user->id;
         $this->object->entity = MultiCompany::getCurrentId();
-        $this->object->statut = Facture::STATUS_DRAFT;
+        $this->setInvoiceStatus(Facture::STATUS_DRAFT);
         $this->object->paye = 0;
         //====================================================================//
         // If Credit Note => Setup Type
@@ -252,7 +253,7 @@ public function updateObjectPdf(): void
         }
         //====================================================================//
         // Only if Invoice is Valid
-        if ($this->object->statut <= 0) {
+        if ($this->getInvoiceStatus() <= 0) {
             return;
         }
         //====================================================================//

diff --git a/splash/src/Objects/Invoice/ItemsTrait.php b/splash/src/Objects/Invoice/ItemsTrait.php
@@ -57,7 +57,7 @@ protected function deleteItem(FactureLigne $factureLigne): bool
         if (Splash::isDebugMode()) {
             //====================================================================//
             // Force Invoice Status To Draft
-            $this->object->statut = 0;
+            $this->setInvoiceStatus(\Facture::STATUS_DRAFT);
         }
         //====================================================================//
         // Perform Line Delete

diff --git a/splash/src/Objects/Invoice/MainTrait.php b/splash/src/Objects/Invoice/MainTrait.php
@@ -181,19 +181,19 @@ protected function getStateFields(string $key, string $fieldName)
             //====================================================================//
 
             case 'isDraft':
-                $this->out[$fieldName] = (0 == $this->object->statut);
+                $this->out[$fieldName] = (Facture::STATUS_DRAFT == $this->getInvoiceStatus());
 
                 break;
             case 'isCanceled':
-                $this->out[$fieldName] = (3 == $this->object->statut);
+                $this->out[$fieldName] = (Facture::STATUS_ABANDONED == $this->getInvoiceStatus());
 
                 break;
             case 'isValidated':
-                $this->out[$fieldName] = (1 == $this->object->statut);
+                $this->out[$fieldName] = (Facture::STATUS_VALIDATED == $this->getInvoiceStatus());
 
                 break;
             case 'isPaid':
-                $this->out[$fieldName] = (2 == $this->object->statut);
+                $this->out[$fieldName] = (Facture::STATUS_CLOSED == $this->getInvoiceStatus());
 
                 break;
             default:
@@ -257,21 +257,21 @@ private function setPaidFlag($data): bool
         }
         //====================================================================//
         // If Status Is Not Validated | Closed => Cannot Update This Flag
-        if (!in_array((int) $this->object->statut, array(Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED), false)) {
+        if (!in_array($this->getInvoiceStatus(), array(Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED), false)) {
             return true;
         }
         //====================================================================//
         // Update This Flag
         if ($data) {
             //====================================================================//
             // Set Paid using Dolibarr Function
-            if ((1 == $this->object->statut) && (1 != $this->object->set_paid($user))) {
+            if ((Facture::STATUS_VALIDATED == $this->getInvoiceStatus()) && (1 != $this->object->set_paid($user))) {
                 return $this->catchDolibarrErrors();
             }
         } else {
             //====================================================================//
             // Set UnPaid using Dolibarr Function
-            if ((2 == $this->object->statut) && (1 != $this->object->set_unpaid($user))) {
+            if ((Facture::STATUS_CLOSED == $this->getInvoiceStatus()) && (1 != $this->object->set_unpaid($user))) {
                 return $this->catchDolibarrErrors();
             }
         }