Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' into patch-11

Browse Source
This commit is contained in:
Frédéric FRANCE
2024-02-29 15:28:43 +01:00
committed by GitHub
parent f7f6a8ca34 c5fccd4110
commit b31a5bbefa
10 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev/tools/codespell/codespell-dict.txt
View File

@@ -9,6 +9,7 @@ aploha->alpha
aplohanothtml->alphanohtml
aplphanothtml->alphanohtml
choosed->chosen
dokument->document
dolibar->dolibarr
dollibar->dolibarr
dollibarr->dolibarr

2
htdocs/adherents/subscription.php
View File

@@ -608,7 +608,7 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
// Public
$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '');
print '<tr><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td class="valeur">'.yn($object->public).'</td></tr>';
print '<tr><td>'.$form->textwithpicto($langs->trans("PublicFile"), $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist), 1, 'help', '', 0, 3, 'publicfile').'</td><td class="valeur">'.yn($object->public).'</td></tr>';
// Other attributes
$cols = 2;

10
htdocs/compta/deplacement/card.php
View File

@@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 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
@@ -97,7 +97,7 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
$error = 0;
$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
$object->km = (float) price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
$object->type = GETPOST('type', 'alpha');
$object->socid = GETPOSTINT('socid');
$object->fk_user = GETPOSTINT('fk_user');
@@ -140,9 +140,9 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
if (!GETPOST('cancel', 'alpha')) {
$result = $object->fetch($id);
$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
$object->type = GETPOST('type', 'alpha');
$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
$object->km = (float) price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
$object->type = GETPOST('type', 'alpha');
$object->socid = GETPOSTINT('socid');
$object->fk_user = GETPOSTINT('fk_user');
$object->note_private = GETPOST('note_private', 'alpha');

4
htdocs/compta/deplacement/class/deplacement.class.php
View File

@@ -3,7 +3,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019-2024 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
@@ -215,7 +215,7 @@ class Deplacement extends CommonObject
public function update($user)
{
// Clean parameters
$this->km = price2num($this->km);
$this->km = (float) price2num($this->km);
// Check parameters
if (!is_numeric($this->km)) {

22
htdocs/core/class/html.form.class.php
View File

@@ -6882,6 +6882,10 @@ class Form
if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
}
if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
// If we use a text browser or screen reader, we use the 'combo' date selector
$usecalendar = 'html';
}
if ($d) {
// Show date with popup
@@ -6916,8 +6920,8 @@ class Form
$retstring .= '<input type="hidden" id="' . $prefix . 'day" name="' . $prefix . 'day" value="' . $sday . '">' . "\n";
$retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";
$retstring .= '<input type="hidden" id="' . $prefix . 'year" name="' . $prefix . 'year" value="' . $syear . '">' . "\n";
} elseif ($usecalendar == 'jquery') {
if (!$disabled) {
} elseif ($usecalendar == 'jquery' || $usecalendar == 'html') {
if (!$disabled && $usecalendar != 'html') {
// Output javascript for datepicker
$minYear = getDolGlobalInt('MIN_YEAR_SELECT_DATE', (date('Y') - 100));
$maxYear = getDolGlobalInt('MAX_YEAR_SELECT_DATE', (date('Y') + 100));
@@ -6959,19 +6963,9 @@ class Form
$retstring .= '>';
// Icone calendrier
if (!$disabled) {
/* Not required. Managed by option buttonImage of jquery
$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
$retstring.='<script nonce="'.getNonce().'" type="text/javascript">';
$retstring.="jQuery(document).ready(function() {";
$retstring.=' jQuery("#'.$prefix.'id").click(function() {';
$retstring.=" jQuery('#".$prefix."').focus();";
$retstring.=' });';
$retstring.='});';
$retstring.="</script>";*/
} else {
if ($disabled) {
$retstringbutton = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
$retsring = $retstringbutton . $retstring;
$retstring = $retstringbutton . $retstring;
}
$retstring .= '</div>';

4
htdocs/core/lib/agenda.lib.php
View File

@@ -2,7 +2,7 @@
/* Copyright (C) 2008-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2022-2024 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2022-2024 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
@@ -46,7 +46,7 @@
* @param int $usergroupid Id of group to filter on users
* @param string $excludetype A type to exclude ('systemauto', 'system', '')
* @param int $resourceid Preselected value of resource for filter on resource
* @param array $search_categ_cus Tag id
* @param int $search_categ_cus Tag id
* @return void
*/
function print_actions_filter(

3
htdocs/core/lib/barcode.lib.php
View File

@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2004-2010 Folke Ashberg: Some lines of code were inspired from work
* of Folke Ashberg into PHP-Barcode 0.3pl2, available as GPL
* source code at http://www.ashberg.de/bar.
@@ -407,7 +408,7 @@ function barcode_encode_genbarcode($code, $encoding)
* @param array $space default: $space[top] = 2 * $scale; $space[bottom]= 2 * $scale; $space[left] = 2 * $scale; $space[right] = 2 * $scale;
* @return string|void
*/
function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = [])
{
global $bar_color, $bg_color, $text_color;
global $font_loc, $filebarcode;

4
htdocs/core/lib/company.lib.php
View File

@@ -7,7 +7,7 @@
* Copyright (C) 2013-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Christophe Battarel <contact@altairis.fr>
* Copyright (C) 2013-2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2015-2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2015-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2017 Rui Strecht <rui.strecht@aliartalentos.com>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
@@ -596,7 +596,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
* Return state translated from an id. Return value is always utf8 encoded and without entities.
*
* @param int $id id of state (province/departement)
* @param int $withcode '0'=Return label,
* @param string $withcode '0'=Return label,
* '1'=Return string code + label,
* '2'=Return code,
* 'all'=return array('id'=>,'code'=>,'label'=>)

3
htdocs/langs/en_US/main.lang
View File

@@ -1275,4 +1275,5 @@ EnterYourAIPromptHere=Enter your AI prompt here
UseOrOperatorShort=or
GoOnList=Go on list
ShowSearchFields=Do a search
MyUserCard=My user file
MyUserCard=My user file
PublicFile=Public file

2
htdocs/projet/class/project.class.php
View File

@@ -494,7 +494,7 @@ class Project extends CommonObject
$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
$sql .= ", ".((int) $conf->entity);
$sql .= ", ".setEntity($this);
$sql .= ", ".(!isset($this->ip) ? 'NULL' : "'".$this->db->escape($this->ip)."'");
$sql .= ")";