Merge branch 'develop' into New-create-public-page-for-recruitement-c…

…andidature
Hystepik · Oct 1, 2024 · 3887991 · 3887991
2 parents 539de9b + 6b2fa56
commit 3887991
Show file tree

Hide file tree

Showing 435 changed files with 4,685 additions and 2,127 deletions.
diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
@@ -8,6 +8,7 @@ aplhanothtml->alphanohtml
 aploha->alpha
 aplohanothtml->alphanohtml
 aplphanothtml->alphanohtml
+centpecent->centpercent
 choosed->chosen
 cumuled->cumulative
 dokument->document

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
@@ -419,7 +419,7 @@
 		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayPropertyType',	// this option costs more time to be supported than it solves time
 		'PhanTypeArraySuspiciousNullable',		// this option costs more time to be supported than it solves time
-		'PhanTypeInvalidDimOffset',				// this option costs more time to be supported than it solves time
+		// 'PhanTypeInvalidDimOffset',			// Helps identify missing array indexes in types or reference to unset indexes
 		'PhanTypeObjectUnsetDeclaredProperty',
 		'PhanTypePossiblyInvalidDimOffset',			// a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is

diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
@@ -68,7 +68,7 @@
 		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
 		'PhanPluginUnknownArrayPropertyType',	// this option costs more time to be supported than it solves time
 		'PhanTypeArraySuspiciousNullable',		// this option costs more time to be supported than it solves time
-		'PhanTypeInvalidDimOffset',				// this option costs more time to be supported than it solves time
+		// 'PhanTypeInvalidDimOffset',			// Helps identify missing array indexes in types or reference to unset indexes
 		'PhanTypeObjectUnsetDeclaredProperty',
 		'PhanTypePossiblyInvalidDimOffset',		// a lot of false positive, in most cases, we want to keep the code as it is
 		'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is

diff --git a/dev/tools/phan/stubs/ovhsms.php b/dev/tools/phan/stubs/ovhsms.php
@@ -0,0 +1,115 @@
+<?php
+/* Copyright (C) 2024		MDW	<[email protected]>
+ */
+
+namespace {
+	/**
+	 *		Use an OVH account to send SMS with Dolibarr
+	 */
+	class OvhSms extends \CommonObject
+	{
+		public $db;
+		//!< To store db handler
+		public $error;
+		//!< To return error code (or message)
+		public $errors = array();
+		//!< To return several error codes (or messages)
+		public $element = 'ovhsms';
+		//!< Id that identify managed object
+		public $id;
+		public $account;
+		public $socid;
+		public $contact_id;
+		public $member_id;
+		public $fk_project;
+		public $nostop;
+		public $expe;
+		public $dest;
+		public $message;
+		public $validity;
+		public $class;
+		public $deferred;
+		public $priority;
+		public $soap;
+		// Old API
+		public $conn;
+		// New API
+		public $endpoint;
+		/**
+		 *	Constructor
+		 *
+		 * 	@param	DoliDB	$db		Database handler
+		 */
+		public function __construct($db)
+		{
+		}
+		/**
+		 * Logout
+		 *
+		 * @return	void
+		 */
+		public function logout()
+		{
+		}
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+		/**
+		 * Send SMS
+		 *
+		 * @return	int     <=0 if error, >0 if OK
+		 */
+		public function SmsSend()
+		{
+		}
+		/**
+		 * Show HTML select box to select account
+		 *
+		 * @return	void
+		 */
+		public function printListAccount()
+		{
+		}
+		/**
+		 * Return list of SMSAccounts
+		 *
+		 * @return	array
+		 */
+		public function getSmsListAccount()
+		{
+		}
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+		/**
+		 * Return Credit
+		 *
+		 * @return	array
+		 */
+		public function CreditLeft()
+		{
+		}
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+		/**
+		 * Return History
+		 *
+		 * @return	array
+		 */
+		public function SmsHistory()
+		{
+		}
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+		/**
+		 * Return list of possible SMS senders
+		 *
+		 * @return array|int	                    <0 if KO, array with list of available senders if OK
+		 */
+		public function SmsSenderList()
+		{
+		}
+		/**
+		 * Call soapDebug method to output traces
+		 *
+		 * @return	void
+		 */
+		public function soapDebug()
+		{
+		}
+	}
+}
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -94,15 +94,15 @@
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes") {
+if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontoadd) {
 	$result = $object->delete($user);
 	if ($result >= 0) {
 		header("Location: fiscalyear.php");
 		exit();
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-} elseif ($action == 'add') {
+} elseif ($action == 'add' && $permissiontoadd) {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
@@ -144,7 +144,7 @@
 		header("Location: ./fiscalyear.php");
 		exit();
 	}
-} elseif ($action == 'update') {
+} elseif ($action == 'update' && $permissiontoadd) {
 	// Update record
 	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
@@ -166,8 +166,19 @@
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 		exit();
 	}
-}
+} elseif ($action == 'reopen' && $permissiontoadd && getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD')) {
+	$result = $object->fetch($id);
+
+	$object->status = GETPOSTINT('status');
+	$result = $object->update($user);
 
+	if ($result > 0) {
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+		exit();
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
 
 
 /*
@@ -364,6 +375,10 @@
 	if ($user->hasRight('accounting', 'fiscalyear', 'write')) {
 		print '<div class="tabsAction">';
 
+		if (getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD') && $object->status == $object::STATUS_CLOSED) {
+			print dolGetButtonAction($langs->trans("ReOpen"), '', 'reopen', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken(), 'reopen', $permissiontoadd);
+		}
+
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 
 		//print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
@@ -128,6 +128,7 @@
 	accessforbidden();
 }
 
+
 /*
  * Action
  */
@@ -169,10 +170,6 @@
 		$filter['t.doc_date<='] = $search_date_end;
 		$param .= '&date_endmonth=' . GETPOSTINT('date_endmonth') . '&date_endday=' . GETPOSTINT('date_endday') . '&date_endyear=' . GETPOSTINT('date_endyear');
 	}
-	if (!empty($search_doc_date)) {
-		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth=' . GETPOSTINT('doc_datemonth') . '&doc_dateday=' . GETPOSTINT('doc_dateday') . '&doc_dateyear=' . GETPOSTINT('doc_dateyear');
-	}
 	if (!empty($search_accountancy_code_start)) {
 		if ($type == 'sub') {
 			$filter['t.subledger_account>='] = $search_accountancy_code_start;
@@ -207,7 +204,7 @@
 	}
 }
 
-if ($action == 'export_csv') {
+if ($action == 'export_csv' && $user->hasRight('accounting', 'mouvements', 'lire')) {
 	$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
 
 	$filename = 'balance';

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
@@ -775,7 +775,7 @@ public function getCatsCpts($catid = 0)
 	 *
 	 * @param	int			$categorytype		-1=All, 0=Only non computed groups, 1=Only computed groups
 	 * @param	int			$active				1= active, 0=not active
-	 * @return	array<array{code:string,label:string,formula:string,position:string,category_type:string,sens:string,bc:string}>|int	Array of groups or -1 if error
+	 * @return	array<array{rowid:string,code:string,label:string,formula:string,position:string,category_type:string,sens:string,bc:string}>|int	Array of groups or -1 if error
 	 * @see getCatsCpts(), getCptsCat()
 	 */
 	public function getCats($categorytype = -1, $active = 1)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
@@ -74,7 +74,7 @@ class AccountingJournal extends CommonObject
 	public $active;
 
 	/**
-	 * @var array<string,array{found:bool,label:string,code_formatted1:string,label_formatted_1:string,label_formatted_2:string}> 	Accounting account cached
+	 * @var array<string,array{found:bool,label:string,code_formatted_1:string,label_formatted_1:string,label_formatted_2:string}> 	Accounting account cached
 	 */
 	public static $accounting_account_cached = array();
 
@@ -583,7 +583,7 @@ public function getAssetData(User $user, $type = 'view', $date_start = null, $da
 
 							$lines = array();
 							$lines[0][$accountancy_code_value_asset_sold] = -((float) $element_static->acquisition_value_ht - $last_cumulative_amount_ht);
-							$lines[0][$accountancy_code_depreciation_asset] = -$last_cumulative_amount_ht;
+							$lines[0][$accountancy_code_depreciation_asset] = - (float) $last_cumulative_amount_ht;
 							$lines[0][$accountancy_code_asset] = $element_static->acquisition_value_ht;
 
 							$disposal_amount_vat = $disposal_subject_to_vat ? (float) price2num($disposal_amount * $disposal_vat / 100, 'MT') : 0;
@@ -928,7 +928,7 @@ public function exportCsv(&$journal_data = array(), $search_date_end = 0, $sep =
 	 *  Get accounting account info
 	 *
 	 * @param	string	$account	Accounting account number
-	 * @return	array{found:bool,label:string,code_formatted1:string,label_formatted_1:string,label_formatted_2:string}		Accounting account info
+	 * @return	array{found:bool,label:string,code_formatted_1:string,label_formatted_1:string,label_formatted_2:string}		Accounting account info
 	 */
 	public function getAccountingAccountInfos($account)
 	{

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2536,7 +2536,7 @@ public function loadFiscalPeriods($force = false, $mode = 'active')
 	}
 
 	/**
-	 * Get list of fiscal period
+	 * Get list of fiscal period ordered by start date.
 	 *
 	 * @param 	string	$filter		Filter
 	 * @return 	array<array{id:int,label:string,date_start:string,date_end:string,status:int}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]