Merge branch 'develop' into sonikf-patch-e-shipment

Dolibarr · Nov 12, 2024 · 56dc58e · 56dc58e
2 parents 842a7d7 + 836bb71
commit 56dc58e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
@@ -17930,21 +17930,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/opensurvey/results.php
 
-		-
-			message: "#^Parameter \\#4 \\$month of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: "#^Parameter \\#5 \\$day of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: "#^Parameter \\#6 \\$year of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
 		-
 			message: "#^Variable \\$allow_comments might not be defined\\.$#"
 			count: 1

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
@@ -1836,13 +1836,17 @@ public function subscriptionComplementaryActions($subscriptionid, $option, $acco
 					}
 				}
 				$invoice->socid = $this->fk_soc;
-				// set customer's bank account on the invoice
+				// set customer's payment bank account on the invoice
 				if (!empty($customer->fk_account)) {
 					$invoice->fk_account = $customer->fk_account;
 				} elseif (getDolGlobalString('FACTURE_RIB_NUMBER')) {
 					// set default bank account from invoice module settings
 					$invoice->fk_account = (int) getDolGlobalString('FACTURE_RIB_NUMBER');
 				}
+				//set customer's payment method on the invoice
+				if (!empty($customer->mode_reglement_id)) {
+					$invoice->mode_reglement_id = $customer->mode_reglement_id;
+				}
 				//$invoice->date = $datesubscription;
 				$invoice->date = dol_now();
 

diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024 Laurent Destailleur  <[email protected]>
+/* Copyright (C) 2024       Laurent Destailleur     <[email protected]>
  * Copyright (C) 2024		Frédéric France			<[email protected]>
  * Copyright (C) 2024		MDW						<[email protected]>
 *
@@ -591,7 +591,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
 				'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 				'table' => $object->table_element,
 				'tablefromt' => $tablepath,
-				'type' => $val['type']  // TODO: Check this, seems a copy/paste error
+				'type' => $extrafields->attributes[$object->table_element]['type'][$key],
 			);
 		}
 	}

diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
@@ -93,7 +93,7 @@
 	$testdate = false;
 	$champdatefin = (int) dol_mktime(23, 59, 59, GETPOSTINT('champdatefinmonth'), GETPOSTINT('champdatefinday'), GETPOSTINT('champdatefinyear'));
 
-	if ($champdatefin > 0) {	// A date was provided, $error still 0 here
+	if ($champdatefin > 0) {	// A date was provided
 		// Expire date is not before today
 		if ($champdatefin >= dol_now()) {
 			$testdate = true;