Merge branch 'develop' into patch-1

Dolibarr · Mar 7, 2024 · addd098 · addd098
2 parents a6881e2 + b4b83c1
commit addd098
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
@@ -238,7 +238,7 @@
 	// Label
 	print '<tr><td>'.$langs->trans("Label").'</td>';
 	print '<td class="valeur">';
-	print '<input type="text" class="flat" name="note" value="'.$object->note_private.'"></td></tr>';
+	print '<input type="text" class="flat" name="note" value="'.$object->note_public.'"></td></tr>';
 
 	// Bank line
 	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
@@ -334,7 +334,7 @@
 	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur"><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_public)).'</td></tr>';
 
 	// Bank line
 	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
@@ -258,7 +258,7 @@
 	$pricetowithdraw = $bprev->SommeAPrelever($type, 'salary');
 }
 if ($nb < 0) {
-	dol_print_error($bprev->error);
+	dol_print_error($db, $bprev->error);
 }
 print '<table class="border centpercent tableforfield">';
 
@@ -479,7 +479,7 @@
 	}
 	$title = $langs->trans("InvoiceWaitingWithdraw");
 	$picto = 'bill';
-	if ($type =='bank-transfer') {
+	if ($type == 'bank-transfer') {
 		if ($sourcetype != 'salary') {
 			$title = $langs->trans("InvoiceWaitingPaymentByBankTransfer");
 		} else {

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
@@ -506,7 +506,7 @@
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expedition', 'supprimer')) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-		$result = $object->delete(0, $also_update_stock);
+		$result = $object->delete($user, 0, $also_update_stock);
 		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -1242,7 +1242,7 @@ public function cancel($notrigger = 0, $also_update_stock = false)
 
 					$mouvS = new MouvementStock($this->db);
 					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
+					$mouvS->origin = '';
 					// get lot/serial
 					$lotArray = null;
 					if (isModEnabled('productbatch')) {
@@ -1440,7 +1440,7 @@ public function delete($user = null, $notrigger = 0, $also_update_stock = false)
 
 					$mouvS = new MouvementStock($this->db);
 					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
+					$mouvS->origin = '';
 					// get lot/serial
 					$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
 					if (!is_array($lotArray)) {

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
@@ -530,6 +530,8 @@ public function delete(User $user, int $notrigger = 0)
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
+		$rowid = $this->id;
+
 		$error = 0;
 
 		$this->db->begin();