Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
ldestailleur 2025-05-05 20:24:47 +02:00
commit a9f2bb6219
8 changed files with 22 additions and 12 deletions

View file

@ -1029,7 +1029,6 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage
ErrorLoginDisabled
ErrorLoginDoesNotExists
ErrorLoginHasNoEmail
ErrorMandatoryParametersNotProvided
ErrorMaxNumberReachForThisMask
ErrorNewRefIsAlreadyUsed
ErrorNoImagickReadimage
@ -2993,7 +2992,6 @@ UserHideExternal
UserHideNonEmployee
UserID
UserLogged
UserLoginFailed
UserLogoff
UserMargins
UserModif

View file

@ -963,8 +963,8 @@ Collation
Config
Creation
CronLib
CronModuleNotEnabledInThisEntity
DateInitialBalance
CronModuleNotEnabledInThisEntity
Dimension
Don
ECM
@ -974,7 +974,6 @@ ErrorLDAPFunctionsAreDisabledOnThisPHP
ErrorUpdating
Extra
FailedToConnectToSFTPAfterSSHAuthentication
FailedToLogin
First
GroupCreate
GroupUpdate

View file

@ -732,16 +732,19 @@ class Account extends CommonObject
// Check parameters
if (empty($this->country_id)) {
$langs->load('errors');
$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"));
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
if (empty($this->ref)) {
$langs->load('errors');
$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
if (empty($this->date_solde)) {
$langs->load('errors');
$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateInitialBalance"));
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
@ -750,6 +753,7 @@ class Account extends CommonObject
// Load libraries to check BAN
$balance = $this->balance;
if (empty($balance) && !empty($this->solde)) {
dol_syslog(get_class($this)."::create solde is deprecated use balance", LOG_NOTICE);
$balance = $this->solde;
}
if (empty($balance)) {
@ -853,8 +857,7 @@ class Account extends CommonObject
if ($accline->insert() < 0) {
$error++;
$this->error = $accline->error;
$this->errors = $accline->errors;
$this->setErrorsFromObject($accline);
}
if (!$error) {

View file

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -38,7 +39,8 @@ function check_user_password_empty($usertotest, $passwordtotest, $entitytotest)
dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);
$login = '';
$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("FailedToLogin");
$langs->load('users');
$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("UserLoginFailed");
return $login;
}

View file

@ -11,7 +11,7 @@
* Copyright (C) 2015 Claudio Aschieri <c.aschieri@19.coop>
* Copyright (C) 2016-2024 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2020 Lenin Rivas <lenin@leninrivas.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
*
@ -369,6 +369,7 @@ class ExpeditionLigne extends CommonObjectLine
*/
public function insert($user, $notrigger = 0)
{
global $langs;
$error = 0;
// Check parameters
@ -376,7 +377,8 @@ class ExpeditionLigne extends CommonObjectLine
|| empty($this->fk_product) // product id is mandatory
|| (empty($this->fk_elementdet) && empty($this->fk_parent)) // at least origin line id of parent line id is set
|| !is_numeric($this->qty)) {
$this->error = 'ErrorMandatoryParametersNotProvided';
$langs->load('errors');
$this->errors[] = $langs->trans('ErrorMandatoryParametersNotProvided');
return -1;
}
@ -629,6 +631,7 @@ class ExpeditionLigne extends CommonObjectLine
*/
public function update($user = null, $notrigger = 0)
{
global $langs;
$error = 0;
dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
@ -675,7 +678,8 @@ class ExpeditionLigne extends CommonObjectLine
// check parameters
if (!isset($this->id) || !isset($this->entrepot_id)) {
dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
$this->errors[] = 'ErrorMandatoryParametersNotProvided';
$langs->load('errors');
$this->errors[] = $langs->trans('ErrorMandatoryParametersNotProvided');
$error++;
return -1;
}
@ -688,7 +692,8 @@ class ExpeditionLigne extends CommonObjectLine
if (empty($batch_id) || empty($this->fk_product)) {
dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
$this->errors[] = 'ErrorMandatoryParametersNotProvided';
$langs->load('errors');
$this->errors[] = $langs->trans('ErrorMandatoryParametersNotProvided');
$error++;
}

View file

@ -23,6 +23,7 @@ BankBalanceAfter=Balance after
BalanceMinimalAllowed=Minimum allowed balance
BalanceMinimalDesired=Minimum desired balance
InitialBankBalance=Initial balance
DateInitialBalance=Date of initial balance
EndBankBalance=End balance
CurrentBalance=Current balance
FutureBalance=Future balance

View file

@ -77,6 +77,7 @@ CronType=Job type
CronType_method=Call method of a PHP Class
CronType_command=Shell command
CronCannotLoadClass=Cannot load class file %s (to use class %s)
CronModuleNotEnabledInThisEntity=Cron module not enabled in this entity (to use %s method of %s object)
CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
JobDisabled=Job disabled

View file

@ -1050,7 +1050,8 @@ class Product extends CommonObject
$this->mandatory_period = empty($this->mandatory_period) ? 0 : $this->mandatory_period;
// Check parameters
if (empty($this->label)) {
$this->error = 'ErrorMandatoryParametersNotProvided';
$langs->load('errors');
$this->errors[] = $langs->trans('ErrorMandatoryParametersNotProvided');
return -1;
}