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

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

Browse Source
This commit is contained in:
ldestailleur
2025-08-17 03:45:53 +02:00
parent 9ccede6c90 1c6a40acbe
commit f07206b6c0
11 changed files with 22 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dev/build/phpstan/phpstan-baseline.neon
View File

@@ -11160,36 +11160,6 @@ parameters:
count: 1
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Variable \$backtopage might not be defined\.$#'
identifier: variable.undefined
count: 3
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Variable \$conf might not be defined\.$#'
identifier: variable.undefined
count: 4
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Variable \$filterabsolutediscount might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Variable \$filtercreditnote might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Variable \$resteapayer might not be defined\.$#'
identifier: variable.undefined
count: 1
path: ../../../htdocs/core/tpl/object_discounts.tpl.php
-
message: '#^Left side of \|\| is always true\.$#'
identifier: booleanOr.leftAlwaysTrue
@@ -11496,12 +11466,6 @@ parameters:
count: 1
path: ../../../htdocs/cron/list.php
-
message: '#^If condition is always false\.$#'
identifier: if.alwaysFalse
count: 3
path: ../../../htdocs/datapolicy/class/datapolicy.class.php
-
message: '#^Method CdavLib\:\:getFullCalendarObjects\(\) should return array\<array\<string\>\> but returns list\<array\<string, int\|string\|false\>\>\.$#'
identifier: return.type

8
htdocs/contact/class/contact.class.php
View File

@@ -1024,7 +1024,7 @@ class Contact extends CommonObject
$langs->loadLangs(array("dict", "companies"));
$sql = "SELECT c.rowid, c.entity, c.fk_soc, c.ref_ext, c.civility as civility_code, c.name_alias, c.lastname, c.firstname,";
$sql .= " c.address, c.statut, c.zip, c.town,";
$sql .= " c.address, c.statut as status, c.zip, c.town,";
$sql .= " c.fk_pays as country_id,";
$sql .= " c.fk_departement as state_id,";
$sql .= " c.birthday,";
@@ -1088,7 +1088,7 @@ class Contact extends CommonObject
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_modification = $this->db->jdate($obj->date_modification);
$this->user_creation_id = $obj->fk_user_creat;
$this->user_creation_id = $obj->fk_user_creat;
$this->user_modification_id = $obj->fk_user_modif;
$this->state_id = $obj->state_id;
@@ -1103,8 +1103,8 @@ class Contact extends CommonObject
$this->socid = $obj->fk_soc; // Both fk_soc and socid are used
$this->socname = $obj->socname;
$this->poste = $obj->poste;
$this->status = $obj->statut;
$this->statut = $obj->statut;
$this->status = $obj->status;
$this->statut = $obj->status; // deprecated
$this->fk_prospectlevel = $obj->fk_prospectlevel;

1
htdocs/core/boxes/box_contacts.php
View File

@@ -137,6 +137,7 @@ class box_contacts extends ModeleBoxes
$contactstatic->lastname = $objp->lastname;
$contactstatic->firstname = $objp->firstname;
$contactstatic->civility_id = $objp->civility_id;
$contactstatic->status = $objp->status;
$contactstatic->statut = $objp->status;
$contactstatic->phone_pro = $objp->phone;
$contactstatic->phone_perso = $objp->phone_perso;

4
htdocs/don/card.php
View File

@@ -5,7 +5,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018-2019 Thibault FOUCART <support@ptibogxiv.net>
* 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) 2025 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -265,7 +265,7 @@ if (empty($reshook)) {
$object->lastname = (string) GETPOST("lastname", 'alpha');
$object->societe = (string) GETPOST("societe", 'alpha');
$object->address = (string) GETPOST("address", 'alpha');
$object->amount = price2num(GETPOST("amount", 'alpha'), '', 2);
$object->amount = (float) price2num(GETPOST("amount", 'alpha'), '', 2);
$object->zip = (string) GETPOST("zipcode", 'alpha');
$object->town = (string) GETPOST("town", 'alpha');
$object->country_id = GETPOSTINT('country_id');

3
htdocs/projet/tasks/contact.php
View File

@@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006-2024 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2025 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -531,6 +531,7 @@ if ($id > 0 || !empty($ref)) {
$contactstatic->lastname = $tab[$i]['lastname'];
$contactstatic->firstname = $tab[$i]['firstname'];
$contactstatic->email = $tab[$i]['email'];
$contactstatic->status = $tab[$i]['statuscontact'];
$contactstatic->statut = $tab[$i]['statuscontact'];
print $contactstatic->getNomUrl(1);
}

1
htdocs/public/project/suggestbooth.php
View File

@@ -321,6 +321,7 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
$contact->country_id = GETPOSTINT("country_id");
$contact->state_id = GETPOSTINT("state_id");
$contact->email = $email;
$contact->status = 1; //Default status to Actif
$contact->statut = 1; //Default status to Actif
$resultcreatecontact = $contact->create($user);

1
htdocs/public/project/suggestconference.php
View File

@@ -321,6 +321,7 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
$contact->country_id = GETPOSTINT("country_id");
$contact->state_id = GETPOSTINT("state_id");
$contact->email = $email;
$contact->status = 1; //Default status to Actif
$contact->statut = 1; //Default status to Actif
$resultcreatecontact = $contact->create($user);
if ($resultcreatecontact < 0) {

9
htdocs/societe/class/societe.class.php
View File

@@ -1354,8 +1354,6 @@ class Societe extends CommonObject
}
}
} else {
//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
if ($key == 'EMAIL') {
// Check for mandatory
if (getDolGlobalString('SOCIETE_EMAIL_MANDATORY') && !isValidEmail($this->email)) {
@@ -1795,8 +1793,7 @@ class Societe extends CommonObject
$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
if ($result < 0) {
$this->error = $lmember->error;
$this->errors = array_merge($this->errors, $lmember->errors);
$this->setErrorsFromObject($lmember);
dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
$error++;
}
@@ -2147,8 +2144,8 @@ class Societe extends CommonObject
$this->cond_reglement_id = $obj->cond_reglement;
$this->deposit_percent = $obj->deposit_percent;
$this->transport_mode_id = $obj->transport_mode;
$this->mode_reglement_supplier_id = $obj->mode_reglement_supplier;
$this->cond_reglement_supplier_id = $obj->cond_reglement_supplier;
$this->mode_reglement_supplier_id = $obj->mode_reglement_supplier;
$this->cond_reglement_supplier_id = $obj->cond_reglement_supplier;
$this->transport_mode_supplier_id = $obj->transport_mode_supplier;
$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
$this->fk_account = $obj->fk_account;

2
htdocs/ticket/class/ticket.class.php
View File

@@ -1866,7 +1866,7 @@ class Ticket extends CommonObject
if (!empty($contacts)) {
// Ensure that contact is active and select first active contact
foreach ($contacts as $contact) {
if ((int) $contact->statut == 1) {
if ((int) $contact->status == 1) {
$actioncomm->contact_id = $contact->id;
break;
}

10
htdocs/webservices/server_contact.php
View File

@@ -2,7 +2,7 @@
/* Copyright (C) 2006-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 JF FERRY <jfefe@aternatik.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-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
@@ -318,7 +318,7 @@ function getContact($authentication, $id, $ref_ext)
'country_code' => $contact->country_code,
'country' => $contact->country,
'socid' => $contact->socid,
'status' => $contact->statut,
'status' => $contact->status,
'phone_pro' => $contact->phone_pro,
'fax' => $contact->fax,
'phone_perso' => $contact->phone_perso,
@@ -428,7 +428,7 @@ function createContact($authentication, $contact)
$newobject->country_code = $contact['country_code'];
$newobject->country = $contact['country'];
$newobject->socid = (int) $contact['socid'];
$newobject->statut = (int) $contact['status'];
$newobject->status = (int) $contact['status'];
$newobject->phone_pro = $contact['phone_pro'];
$newobject->fax = $contact['fax'];
$newobject->phone_perso = $contact['phone_perso'];
@@ -437,7 +437,7 @@ function createContact($authentication, $contact)
$newobject->email = $contact['email'];
$newobject->birthday = $contact['birthday'];
$newobject->default_lang = $contact['default_lang'];
$newobject->note = $contact['note'];
$newobject->note_private = $contact['note'];
$newobject->ref_facturation = (int) $contact['ref_facturation'];
$newobject->ref_contrat = (int) $contact['ref_contrat'];
$newobject->ref_commande = (int) $contact['ref_commande'];
@@ -590,7 +590,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
'ref_propal' => $contact->ref_propal ? $contact->ref_propal : '',
'user_id' => $contact->user_id ? $contact->user_id : '',
'user_login' => $contact->user_login ? $contact->user_login : '',
'status' => $contact->statut ? $contact->statut : ''
'status' => $contact->status ? $contact->status : ''
);
$i++;

3
htdocs/webservices/server_user.php
View File

@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2006-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-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
@@ -606,6 +606,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
$contact->phone_pro = $thirdparty->phone;
$contact->phone_mobile = $thirdpartywithuser['phone_mobile'];
$contact->fax = $thirdparty->fax;
$contact->status = 1;
$contact->statut = 1;
$contact->country_id = $thirdparty->country_id;
$contact->country_code = $thirdparty->country_code;