Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/langs/en_US/website.lang

ChangeLog

@@ -22,21 +22,51 @@ Following changes may create regressions for some external modules, but were nec
 FIX: #10381
 FIX: #10460 compatibility with MariaDB 10.4
 FIX: #10485
+FIX: #10638
+FIX: Accountancy - Adding transaction with multicompany uses all the time 1st entity
+FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
 FIX: add fk_unit on addline action
+FIX: adding css by page if url is externam
+FIX: Bad link in menu manager
 FIX: better test on fetch
+FIX: can't add lines on invoices
+FIX: Check for old picture name if the new one was not found
+FIX: could not create several superadmin in transversal mode
+FIX: creation of menu entry with parent id not int
+FIX: creation of new left menu entry
 FIX: Default language of company is not set
+FIX: error on setup of password if pass generators have a .old file.
 FIX: error report not returned
 FIX: expedition: reset status on rollback + replace hardcoded status with const
+FIX: fetch module / pos source
+FIX: fk_default_warehouse missing in group by
+FIX: function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it
+FIX: if empty error message, we just see "error" displayed
+FIX: label of bank account
 FIX: line edit template: keep fk_parent_line
+FIX: Mark credit note as available for credit note in other currency
+FIX: missing access security checking with multicompany
+FIX: missing entity filter in function "build_filterField()" (export module)
+FIX: missing $ismultientitymanaged for previous/next ref
 FIX: Missing province in export of invoice
 FIX: must fetch member in current entity
+FIX: positive values creating diff on addline rounding
+FIX: positive values IN supplier credit notes creating diff on addline rounding
 FIX: Price in combo list of service does not use the correct price level
-FIX: supplier invoice payment total doesnt care about deposit or credit
+FIX: project_title for display of getNomUrl()
+FIX: same thing here
+FIX: Show button POS Ticket only if invoice was generated by POS
+FIX: supplier invoice payment total doesn't care about deposit or credit
 FIX: supplier invoice product stats total ht is line total not invoice total
+FIX: The notes was also copied on invoice
+FIX: Transaction on leave approval and decrease ko if setup not complete
 FIX: Translation not loaded by scheduled jobs
+FIX: [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
+FIX: we want to be able to reopen fourn credit note
+FIX: wrong feature2 when user rights "group_advance" is used
 FIX: wrong merged conflict
 FIX: wrong tests on fetch
-NEW: Add protection to avoid packaging if files non indexed exists into
+NEW: Add protection to avoid packaging if files non indexed exists
 
 ***** ChangeLog for 9.0.0 compared to 8.0.0 *****
 For Users:

htdocs/core/modules/DolibarrModules.class.php

@@ -915,21 +915,26 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     /**
      * Gives the last date of activation
      *
-     * @return timestamp       Date of last activation
+     * @return timestamp|string       Date of last activation
      */
     public function getLastActivationDate()
     {
         global $conf;
 
+        $err = 0;
+
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
-        if (! $resql) {
+        if (! $resql)
+        {
             $err++;
-        } else {
+        }
+        else
+        {
             $obj=$this->db->fetch_object($resql);
             if ($obj) {
                 return $this->db->jdate($obj->tms);
@@ -949,15 +954,20 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         global $conf;
 
-        $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql.= " AND entity IN (0, ".$conf->entity.")";
+        $err = 0;
+
+		$sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
+		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql.= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
-        if (! $resql) {
+        if (! $resql)
+        {
             $err++;
-        } else {
+        }
+        else
+        {
             $obj=$this->db->fetch_object($resql);
             $tmp=array();
             if ($obj->note) {

htdocs/langs/en_US/website.lang

@@ -95,3 +95,4 @@ InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
 NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to