Merge remote-tracking branch 'Dolibarr/19.0' into 19

fappels · Feb 14, 2024 · afd7cc9 · afd7cc9
2 parents 5b0c075 + 75c0502
commit afd7cc9
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 13 deletions.
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
@@ -583,6 +583,7 @@
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/README.md`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -9457,7 +9457,7 @@ protected function setSaveQuery()
 					$queryarray[$field] = ((int) $conf->entity);
 				} else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
-					if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
+					if ((isset($this->{$field}) && ((string) $this->{$field}) != '') || !empty($info['notnull'])) {
 						if (!isset($this->{$field})) {
 							$queryarray[$field] = 0;
 						} elseif ($this->isInt($info)) {

diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
@@ -212,9 +212,9 @@ function check_events() {
 
 		result = 1;
 	} else {
-		console.log("Cancel check_events() with dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page+". Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https or browser is in Private mode).");
+		console.log("Cancel check_events() with dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page+". Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manually or web site is not https or browser is in Private mode).");
 
-		result = 2;	// We return a positive so the repeated check will done even if authroization is not yet allowed may be after this check)
+		result = 2;	// We return a positive so the repeated check will done even if authorization is not yet allowed may be after this check)
 	}
 
 	if (dolnotif_nb_test_for_page >= 5) {

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
@@ -2560,7 +2560,7 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
  * TODO Replace code that set $accessallowed by a call to restrictedArea()
  *
- * @param	string		$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
+ * @param	string		$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Example: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string		$original_file		Relative path with filename, relative to modulepart.
  * @param	string		$entity				Restrict onto entity (0=no restriction)
  * @param  	User|null	$fuser				User object (forced)

diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -92,6 +92,7 @@ ALTER TABLE llx_adherent DROP COLUMN whatsapp;
 ALTER TABLE llx_societe DROP COLUMN skype;
 
 ALTER TABLE llx_user ADD COLUMN email_oauth2 varchar(255);
+ALTER TABLE llx_user ADD COLUMN last_main_doc varchar(255);
 
 ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_demande_ext_payment_id (ext_payment_id);
 
@@ -155,7 +156,7 @@ ALTER TABLE llx_resource ADD COLUMN zip varchar(25) DEFAULT NULL AFTER address;
 ALTER TABLE llx_resource ADD COLUMN town varchar(50) DEFAULT NULL AFTER zip;
 ALTER TABLE llx_resource ADD COLUMN photo_filename varchar(255) DEFAULT NULL AFTER town;
 ALTER TABLE llx_resource ADD COLUMN max_users integer DEFAULT NULL AFTER photo_filename;
-ALTER TABLE llx_resource ADD COLUMN phone varchar(255) DEFAULT NULL AFTER user_places;
+ALTER TABLE llx_resource ADD COLUMN phone varchar(255) DEFAULT NULL AFTER max_users;
 ALTER TABLE llx_resource ADD COLUMN email varchar(255) DEFAULT NULL AFTER phone;
 ALTER TABLE llx_resource ADD COLUMN url varchar(255) DEFAULT NULL AFTER email;
 ALTER TABLE llx_resource ADD COLUMN fk_state integer DEFAULT NULL AFTER fk_country;

diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
@@ -80,7 +80,7 @@ create table llx_user
   note_public		      text,
   note_private            text          DEFAULT NULL,
   model_pdf               varchar(255)  DEFAULT NULL,
-  last_main_doc			      varchar(255),					              -- relative filepath+filename of last main generated document
+  last_main_doc           varchar(255),					            -- relative filepath+filename of last main generated document
   datelastlogin           datetime,
   datepreviouslogin       datetime,
   datelastpassvalidation  datetime,				                    -- last date we change password or we made a disconnect all
@@ -94,7 +94,7 @@ create table llx_user
   openid                  varchar(255),
   statut                  tinyint       DEFAULT 1,
   photo                   varchar(255),				                -- filename or url of photo
-  lang                    varchar(6),					                -- default language for communication. Note that language selected by user as interface language is savec into llx_user_param.
+  lang                    varchar(6),					            -- default language for communication. Note that language selected by user as interface language is savec into llx_user_param.
   color                   varchar(6),
   barcode                 varchar(255)  DEFAULT NULL,
   fk_barcode_type         integer       DEFAULT 0,

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -2442,3 +2442,4 @@ RecommendedForProduction=Recommended for Production
 RecommendedForDebug=Recommended for Debug
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
+EnterAnIP=Enter an IP address
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -397,7 +397,7 @@
 			}
 
 			// Back to draft
-			if ($object->status == $object::STATUS_VALIDATED) {
+			if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_RECRUITED) {
 				if ($permissiontoadd) {
 					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				}

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
@@ -80,7 +80,7 @@
 }
 
 .bodytakepos {
-	background-color: #EEE;
+	background-color: var(--colorbackgrey);
 }
 
 .center {
@@ -184,6 +184,7 @@
 
 button.actionbutton {
 	background: #EABCA6;
+	color: #222;
 	border: 2px solid #EEE;
 	min-height: 40px;
 	border-radius: 3px;

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
@@ -349,9 +349,11 @@ function LoadProducts(position, issubcat) {
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&category='+currentcat+'&tosell=1&limit='+limit+'&offset=0', function(data) {
 		console.log("Call ajax.php (in LoadProducts) to get Products of category "+currentcat+" then loop on result to fill image thumbs");
 		console.log(data);
+
 		while (ishow < maxproduct) {
-			//console.log("ishow"+ishow+" idata="+idata);
-			console.log(data[idata]);
+			console.log("ishow"+ishow+" idata="+idata);
+			//console.log(data[idata]);
+
 			if (typeof (data[idata]) == "undefined") {
 				<?php if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 					echo '$("#prodivdesc"+ishow).hide();';
@@ -364,8 +366,10 @@ function LoadProducts(position, issubcat) {
 				}?>
 				$("#proprice"+ishow).attr("class", "hidden");
 				$("#proprice"+ishow).html("");
+
 				$("#prodiv"+ishow).data("rowid","");
 				$("#prodiv"+ishow).attr("data-rowid","");
+
 				$("#prodiv"+ishow).attr("class","wrapper2 divempty");
 			} else  {
 				<?php
@@ -404,13 +408,14 @@ function LoadProducts(position, issubcat) {
 					?>
 				}
 				console.log("#prodiv"+ishow+".data(rowid)="+data[idata]['id']);
-				console.log($("#prodiv"+ishow));
 
 				$("#prodiv"+ishow).data("rowid", data[idata]['id']);
 				$("#prodiv"+ishow).attr("data-rowid", data[idata]['id']);
 				console.log($('#prodiv4').data('rowid'));
+
 				$("#prodiv"+ishow).data("iscat", 0);
 				$("#prodiv"+ishow).attr("data-iscat", 0);
+
 				$("#prodiv"+ishow).attr("class","wrapper2");
 
 				<?php

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
@@ -2184,7 +2184,7 @@
 
 	.menuhider { display: block !important; }
 	.dropdown-user-image { display: none; }
-	.user-header { height: auto !important; color: var(--colorbackbody); }
+	.user-header { height: auto !important; color: var(--colortextbackhmenu); }
 
 	#id-container {
 		width: 100%;
@@ -7970,6 +7970,9 @@
 		max-width: 200px;      /* must be width of menu + padding + padding of sidenav */
 		width: 200px;          /* must be width of menu + padding + padding of sidenav */
 	}
+	.loginbuttonexternal {
+		width: 260px;
+	}
 	.side-nav-vert .user-menu .dropdown-menu {
 		width: 234px !important;
 	}

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
@@ -7853,6 +7853,9 @@
 	div.login_block {
 		border-right: 1px solid rgba(0,0,0,0.3);
 	}
+	.loginbuttonexternal {
+		width: 260px;
+	}
 
 	div.tmenucenter {
 		  text-overflow: clip;