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

.github/workflows/gh-travis.yml

@@ -27,11 +27,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      # matrix:
-      #   php-version:
+      matrix:
+         php-version:
       #  # PHPStan requires PHP >= 7.2.
       #    #- "7.2"
-      #    - "8.2"
+          - "8.2"
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Checkout travis file

.github/workflows/test.yaml

@@ -1,30 +0,0 @@
-name: Test github actions
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-
-env:
-  ENVGHT: ${{ secrets.GITHUB_TOKEN }}
-  ENVGHU: ${{ github.token }}
-  TEST_ACCESS_KEY: ${{ secrets.TEST_ACCESS_KEY }}
-  TEST_VAR_REPO: ${{ vars.TEST_VAR_REPO }}
-  TEST_VAR_ORGA: ${{ vars.TEST_VAR_ORGA }}
-  ENVLOCAL: "varenvlocal"
-
-jobs:
-  testjob:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Log
-        run: |
-          echo "Run action by ${{ github.actor }}"
-          echo "github.token=${{ github.token }}"
-          echo "secrets.GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
-          echo "GITHUB_EVENT_PATH=$GITHUB_EVENT_PATH"
-          echo "repo-token: ${{secrets.GITHUB_TOKEN}}"
-          echo "secret repository TEST_ACCESS_KEY: ${{secrets.TEST_ACCESS_KEY}}"
-          echo "variable repository : ${{vars.TEST_VAR_REPO}}"
-          echo "variable organization : ${{vars.TEST_VAR_ORGA}}"
-          echo "ENVLOCAL: ${{env.ENVLOCAL}}"

htdocs/admin/modulehelp.php

@@ -364,8 +364,9 @@ if ($mode == 'desc') {
 		$tmpdirofmoduletoshow = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', (string) $dirofmodule);
 		$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $tmpdirofmoduletoshow);
 
+		$installmoduleslock = DOL_DATA_ROOT.'/installmodules.lock';
 		global $dolibarr_allow_download_external_modules;
-		if (!empty($dolibarr_allow_download_external_modules) && preg_match('/\/custom\//', (string) $dirofmodule)) {
+		if ((!file_exists($installmoduleslock) || !empty($dolibarr_allow_download_external_modules)) && preg_match('/\/custom\//', (string) $dirofmodule)) {
 			// Add a link to download a zip of the module
 			$textexternal .= ' <a href="'.DOL_URL_ROOT.'/admin/tools/export_files.php?export_type=externalmodule&what='.urlencode($moduledir).'&compression=zip&zipfilename_template=module_'.$moduledir.'-'.$version.'.notorig" target="_blank" rel="noopener">'.img_picto('', 'download').'</a>';
 		}

htdocs/compta/cashcontrol/class/cashcontrol.class.php

@@ -228,6 +228,7 @@ class CashControl extends CommonObject
 		$sql .= ", cash";
 		$sql .= ", cheque";
 		$sql .= ", card";
+		$sql .= ", fk_user_creat";
 		$sql .= ") VALUES (";
 		//$sql .= "'(PROV)', ";
 		$sql .= ((int) $conf->entity);
@@ -242,6 +243,7 @@ class CashControl extends CommonObject
 		$sql .= ", ".price2num($this->cash, 'MT');
 		$sql .= ", ".price2num($this->cheque, 'MT');
 		$sql .= ", ".price2num($this->card, 'MT');
+		$sql .= ", ".((int) $user->id);
 		$sql .= ")";
 
 		$this->db->begin();

htdocs/compta/facture/card.php

@@ -1725,6 +1725,9 @@ if (empty($reshook)) {
 
 								$amount_ttc_diff = 0.;
 								foreach ($TTotalByTva as $tva => &$total) {
+									if (empty($amountdeposit[$tva])) {
+										$amountdeposit[$tva] = 0;
+									}
 									$coef = $total / $srcobject->total_ttc; // Calc coef
 									$am = $amount * $coef;
 									$amount_ttc_diff += $am;
@@ -1749,6 +1752,10 @@ if (empty($reshook)) {
 											if ($qualified) {
 												$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 												$tva_tx = $lines[$i]->tva_tx;
+
+												if (empty($amountdeposit[$tva_tx])) {
+													$amountdeposit[$tva_tx] = 0;
+												}
 												$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * (float) $valuedeposit) / 100;
 											}
 										}

htdocs/holiday/month_report.php

@@ -168,7 +168,7 @@ $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 $sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday, cp.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
-$sql .= " WHERE cp.rowid > 0";
+$sql .= " WHERE cp.entity IN (".getEntity('holiday').") AND cp.rowid > 0";
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (";
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";

htdocs/install/mysql/tables/llx_actioncomm.sql

@@ -80,9 +80,9 @@ create table llx_actioncomm
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
   elementtype		varchar(255) DEFAULT NULL,		-- For link to an element (proposal, invoice, order, ...)
 
-  ip            varchar(250),              --ip used to create record (for public submission page)
+  ip            varchar(250),              -- ip used to create record (for public submission page)
 
-  fk_bookcal_calendar integer DEFAULT NULL, --fk_bookcal_calendar used to link booking to bookcal calendar
+  fk_bookcal_calendar integer DEFAULT NULL, -- fk_bookcal_calendar used to link booking to bookcal calendar
 
   import_key		varchar(14),
   extraparams		varchar(255)					-- for other parameters with json format