Merge branch 'develop' into fix_updatelines_propal

Dolibarr · Nov 30, 2024 · 4621012 · 4621012
2 parents 8a4ced4 + ac231f4
commit 4621012
Show file tree

Hide file tree

Showing 46 changed files with 336 additions and 438 deletions.
diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
@@ -17526,228 +17526,12 @@ parameters:
 			count: 3
 			path: ../../htdocs/core/tpl/objectlinked_lineimport.tpl.php
 
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 29
-			path: ../../htdocs/core/tpl/onlinepaymentlinks.tpl.php
-
-		-
-			message: '#^Variable \$servicename might not be defined\.$#'
-			identifier: variable.undefined
-			count: 6
-			path: ../../htdocs/core/tpl/onlinepaymentlinks.tpl.php
-
 		-
 			message: '#^Variable \$langs might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../htdocs/core/tpl/originproductline.tpl.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$disabled might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$dol_url_root might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$focus_element might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 10
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$mode might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$urllogo might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$user might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$username might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordforgotten.tpl.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$disabled might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$dol_url_root might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$focus_element might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 18
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$mode might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$newpass1 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$newpass2 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$passworduidhash might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$setnewpassword might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$urllogo might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$user might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$username might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/passwordreset.tpl.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/core/tpl/resource_add.tpl.php
-
-		-
-			message: '#^Variable \$element might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_add.tpl.php
-
-		-
-			message: '#^Variable \$element_id might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_add.tpl.php
-
-		-
-			message: '#^Variable \$element_ref might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_add.tpl.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../htdocs/core/tpl/resource_add.tpl.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$element might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$element_id might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 7
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$linked_resources might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$mode might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
-		-
-			message: '#^Variable \$resource_type might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/core/tpl/resource_view.tpl.php
-
 		-
 			message: '#^Variable \$shippingline might not be defined\.$#'
 			identifier: variable.undefined

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
@@ -127,7 +127,9 @@
 	$res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res3 = dolibarr_set_const($db, 'ADHERENT_CREATE_EXTERNAL_USER_LOGIN', GETPOST('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res7 = dolibarr_set_const($db, 'MEMBER_PUBLIC_ENABLED', GETPOST('MEMBER_PUBLIC_ENABLED', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MEMBER_PUBLIC_ENABLED')) {
+		$res7 = dolibarr_set_const($db, 'MEMBER_PUBLIC_ENABLED', GETPOST('MEMBER_PUBLIC_ENABLED', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
 	$res8 = dolibarr_set_const($db, 'MEMBER_SUBSCRIPTION_START_FIRST_DAY_OF', GETPOST('MEMBER_SUBSCRIPTION_START_FIRST_DAY_OF', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res9 = dolibarr_set_const($db, 'MEMBER_SUBSCRIPTION_START_AFTER', GETPOST('MEMBER_SUBSCRIPTION_START_AFTER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// Use vat for invoice creation
@@ -138,7 +140,7 @@
 			$res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
 		}
 	}
-	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0) {
+	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0 || $res9 < 0) {
 		setEventMessages('ErrorFailedToSaveData', null, 'errors');
 		$db->rollback();
 	} else {
@@ -549,10 +551,12 @@
 print "</td></tr>\n";
 
 // Publish member information on public annuary
-$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.((int) $conf->entity) : '');
-print '<tr class="oddeven"><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td>';
-print $form->selectyesno('MEMBER_PUBLIC_ENABLED', getDolGlobalInt('MEMBER_PUBLIC_ENABLED'), 1, false, 0, 1);
-print "</td></tr>\n";
+/* Feature disabled by default for security purpose.
+	$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.((int) $conf->entity) : '');
+	print '<tr class="oddeven"><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td>';
+	print $form->selectyesno('MEMBER_PUBLIC_ENABLED', getDolGlobalInt('MEMBER_PUBLIC_ENABLED'), 1, false, 0, 1);
+	print "</td></tr>\n";
+*/
 
 // Allow members to change type on renewal forms
 /* To test during next beta

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
@@ -1126,9 +1126,9 @@ function refreshNatureCss() {
 		// State
 		if (!getDolGlobalString('MEMBER_DISABLE_STATE')) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($soc->country_id) {
+			if ($soc->country_id || GETPOSTISSET('country_id')) {
 				print img_picto('', 'state', 'class="pictofixedwidth"');
-				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOSTINT('state_id') : $soc->state_id, $soc->country_code);
+				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOSTINT('state_id') : $soc->state_id, GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $soc->country_code);
 			} else {
 				print $countrynotdefined;
 			}

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
@@ -280,7 +280,6 @@
 		$search_filter = "";
 		$search_status = "";
 		$search_import_key = '';
-		$catid = "";
 		$search_all = "";
 		$toselect = array();
 		$search_datec_start = '';
@@ -523,7 +522,7 @@
 	$sql .= natural_search("d.firstname", $search_firstname);
 }
 if ($search_lastname) {
-	$sql .= natural_search(array("d.firstname", "d.lastname", "d.societe"), $search_lastname);
+	$sql .= natural_search("d.lastname", $search_lastname);
 }
 if ($search_gender != '' && $search_gender != '-1') {
 	$sql .= natural_search("d.gender", $search_gender);
@@ -532,7 +531,7 @@
 	$sql .= natural_search("d.login", $search_login);
 }
 if ($search_company) {
-	$sql .= natural_search("s.nom", $search_company);
+	$sql .= natural_search(array("s.nom", "d.societe"), $search_company);
 }
 if ($search_email) {
 	$sql .= natural_search("d.email", $search_email);

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
@@ -223,11 +223,11 @@
 	$selectedvalue = 1;
 }
 
-print "<table class=\"noborder\" width=\"100%\">";
+print "<table class=\"noborder centpercent\">";
 
 print "<tr class=\"liste_titre\">";
 print '<td>'.$langs->trans("Parameter")."</td>";
-print '<td class="center">'.$langs->trans("Value")."</td>";
+print '<td class="center"></td>';
 print "</tr>";
 
 // Show external agenda

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
@@ -221,7 +221,7 @@
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = 'action'";
-$sql .= " AND entity = ".$conf->entity;
+$sql .= " AND entity = ".((int) $conf->entity);
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -346,7 +346,7 @@
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="right"></td>'."\n";
 print '</tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
@@ -182,7 +182,7 @@
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="right"></td>'."\n";
 print '</tr>'."\n";
 
 // AGENDA REMINDER BROWSER

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
@@ -121,7 +121,7 @@
 
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>";
-print "<td>".$langs->trans("Value")."</td>";
+print "<td></td>";
 //print "<td>".$langs->trans("Examples")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
@@ -180,8 +180,8 @@
 
 clearstatcache();
 
-//if ($mesg) print "<br>$mesg<br>";
-print "<br>";
+
+print "<br><br>";
 
 
 // Define $urlwithroot