Commit graph

133486 commits

Author SHA1 Message Date
Laurent Destailleur
d07b7dc72e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-09 19:05:41 +01:00
Laurent Destailleur
2f1eecd709 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-09 19:04:06 +01:00
Laurent Destailleur
027e0334a2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-09 19:03:33 +01:00
Laurent Destailleur
e22dabe59a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-09 19:03:26 +01:00
Laurent Destailleur
48c3dfb9eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:03:03 +01:00
Laurent Destailleur
f5df332d3e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:02:56 +01:00
lamrani abdelwadoud
e68e0283ca
update function show_actions_done for list users events (#28095) 2024-02-09 19:01:45 +01:00
Laurent Destailleur
66cb45947c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 18:57:37 +01:00
MDW
0394c2bea9
Qual: disable PHPCS action (now performed by pre-commit) (#28097)
# Qual: disable PHPCS action (now performed by pre-commit)

The php-cs analysis is now ensured by pre-commit which does analysis
on changed files in PR's and full analysis in the main branches.

It also provides better reports (PHPCS did not report all the issues
seen in travis).
2024-02-09 18:57:27 +01:00
thibdrev
dbcfa15f72
qual: phpstan for htdocs/commande/class/commande.class.php (#28099)
* Update commande.class.php

* Update commonobject.class.php
2024-02-09 18:57:04 +01:00
thibdrev
07edb9b967
qual: phpstan for htdocs/adherents/class/api_memberstypes.class.php (#28098)
* Update subscription.class.php

* Update commonobject.class.php

* Update subscription.class.php

* Update commonobject.class.php

* Update subscription.class.php

* Update subscription.class.php

* Update commonobject.class.php

* Update commonobject.class.php

* Update subscription.class.php
2024-02-09 18:56:50 +01:00
lvessiller-opendsi
62632893ad
FIX avoid from re-initializing result on nested hook getEntity (#27799)
* FIX avoid from re-initializing result on nested hook getEntity

* FIX uses local resPrint instead of cloning hookmanager for nested hooks
2024-02-09 18:15:35 +01:00
Laurent Destailleur
a8309ef8ee Fix missing migration 2024-02-09 17:57:38 +01:00
Laurent Destailleur
3db4a9f2fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 17:55:19 +01:00
Laurent Destailleur
d4296c2ffd Work on website templates from external modules 2024-02-09 17:54:57 +01:00
Lucas Marcouiller
0a7ae2a139
Fix MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE send protection (#28091)
* Fix autocopy send protection

* fix verification to replace mail in maillist

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-09 16:54:28 +01:00
noec764
fac22fd16f
NEW: Hook after total Table on PDF (#28092)
Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 16:53:36 +01:00
Philippe Grand
c782686610
fix : Fatal error: Uncaught Error: Object of class Conf could not be converted to string in /srv/users/dolibarr/apps/dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php:98 Stack trace: #0 /srv/users/dolibarr/apps/dolibarr/htdocs/societe/admin/societe.php(495): mod_codecompta_aquarium->info(Object(Translate)) #1 {main} thrown in /srv/users/dolibarr/apps/dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php on line 98 (#28093) 2024-02-09 16:52:17 +01:00
Laurent Destailleur
b0ccf87b43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 16:16:01 +01:00
Laurent Destailleur
5637dd2f3f Fix do not use oauth if link was not clicked 2024-02-09 16:15:08 +01:00
Laurent Destailleur
ca0a3432b6 Fix phpcs 2024-02-09 16:00:35 +01:00
MDW
7b54824d49
Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

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

* Qual: Introduce getDataToShowPhoto to prepare generic code

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

* Fix missing trans

* Fix langs

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

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

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

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

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

* WIP EMAILINGS_SUPPORT_ALSO_SMS

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

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

* WIP SMSing

* Debug the "validate" feature

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

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

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

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

* Enhance rector to fix empty($user->rights->modulex->perm1)

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

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

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

* Fix user with readonly perm on email template must be able to read.

* Fix doc

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

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

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

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
Laurent Destailleur
275dbca5fa CSS to break descriptions 2024-02-09 15:46:31 +01:00
Laurent Destailleur
f3796f59eb NEW Add import ID in list of products 2024-02-09 15:02:02 +01:00
thomas-Ngr
ac6b230a86
Fix : modules templates were not fetched for linkedobjectblock (#28084) 2024-02-09 14:10:37 +01:00
lvessiller-opendsi
e3ad92df44
FIX check parameter socid before cloning a customer proposal (#28085) 2024-02-09 14:09:03 +01:00
noec764
2c07bd764d
FIX: Bar code verification should be done by entity because generation does (#28087)
* FIX: Bar code verification should be done by entity because generation does

* FIX: handle Entities shared tables

* FIX: Remove unused global

---------

Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 14:07:04 +01:00
Laurent Destailleur
4707304775 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 13:34:30 +01:00
Laurent Destailleur
2743639947 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 13:33:04 +01:00
Laurent Destailleur
0f53fe10d1 FIX oauth authent must be done only on click on link
Better message for notification denied.
2024-02-09 13:32:44 +01:00
Laurent Destailleur
290cb8447a comment 2024-02-09 12:12:54 +01:00
thibdrev
c19ad24e7d
qual: phpstan for htdocs/fourn/class/fournisseur.commande.dispatch.class.php (#28035)
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	156	Property CommandeFournisseurDispatch::$fk_commande (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	159	Property CommandeFournisseurDispatch::$fk_product (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	162	Property CommandeFournisseurDispatch::$fk_commandefourndet (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	168	Property CommandeFournisseurDispatch::$fk_entrepot (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	171	Property CommandeFournisseurDispatch::$fk_user (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	177	Property CommandeFournisseurDispatch::$status (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	355	Property CommandeFournisseurDispatch::$fk_commande (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	358	Property CommandeFournisseurDispatch::$fk_product (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	361	Property CommandeFournisseurDispatch::$fk_commandefourndet (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	367	Property CommandeFournisseurDispatch::$fk_entrepot (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	370	Property CommandeFournisseurDispatch::$fk_user (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	376	Property CommandeFournisseurDispatch::$status (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	629	Property CommandeFournisseurDispatch::$fk_commande (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	630	Property CommandeFournisseurDispatch::$fk_product (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	631	Property CommandeFournisseurDispatch::$fk_commandefourndet (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	633	Property CommandeFournisseurDispatch::$fk_entrepot (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	634	Property CommandeFournisseurDispatch::$fk_user (int) does not accept string.
htdocs/fourn/class/fournisseur.commande.dispatch.class.php	637	Property CommandeFournisseurDispatch::$status (int) does not accept string.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-09 11:39:08 +01:00
MDW
f6fc93249d
Qual: Lower severity on php-cs messages that should not block (#28072)
# Qual: Lower severity on php-cs messages that should not block

Some warning messages result in php-cs having an exit code of 2 and others
only have an exit ocde of 1.  When the exit code is 2, the warnings are fixable
by php-cbf.

In order to be able to filter on the warnings in the github ci flow, but still
show them in the travis flow, I lower the level of the warnings that should not
be blocking to 4.

At the same time, the php-cs configuration in pre-commit now requires that the
severity is minimum 5 to show the message (level 5 is the default for all warnings
and errors).

So this will limit the warning messages to the ones that should result in a failing
ci action.  If any new cases are discovered, they should also be lowered in the
php-cs configuration file.
2024-02-09 11:38:37 +01:00
thomas-Ngr
6a8be838be
14.0 fix CVE 2024 23817 (#28090)
* FIX CVE-2024-23817

* FIX syntax error

---------

Co-authored-by: Regis Houssin <regis.houssin@inodbox.com>
2024-02-09 11:37:55 +01:00
Frédéric FRANCE
0790abe530
fix social networks icons (#28078) 2024-02-09 11:35:36 +01:00
Frédéric FRANCE
5fdfcf7586
fix phpcs warning (#28074) 2024-02-09 11:30:27 +01:00
Frédéric FRANCE
6cc1c23227
fix picto for modAi (#28076) 2024-02-09 11:30:13 +01:00
thibdrev
0f62b8e7bc
qual: phpstan (#28075)
* qual: phpstan for htdocs/core/lib/images.lib.php

htdocs/core/lib/images.lib.php	636	Function vignette() should return string but returns int.

* qual: phpstan for htdocs/core/lib/product.lib.php

htdocs/core/lib/product.lib.php	839	Function measuringUnitString() should return string but returns int.

* qual: phpstan for htdocs/core/lib/website.lib.php

htdocs/core/lib/website.lib.php	222	Function dolWebsiteReplacementOfLinks() should return bool but returns string.

* qual: phpstan for htdocs/core/lib/functions.lib.php

htdocs/core/lib/functions.lib.php	9576	Function dol_getIdFromCode() should return int but returns string.

* qual: phpstan for htdocs/core/modules/import/modules_import.php

htdocs/core/modules/import/modules_import.php	173	Method ModeleImports::getDriverId() should return int but returns string.

* qual: phpstan for htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

htdocs/core/modules/mailings/thirdparties_services_expired.modules.php	100	Method mailing_thirdparties_services_expired::add_to_target() should return int but returns string.

* qual:phpstan for htdocs/loan/schedule.php

htdocs/loan/schedule.php	80	Property LoanSchedule::$datec (string) does not accept int.
2024-02-09 11:28:33 +01:00
Frédéric FRANCE
dd66a34fe9
fix pictos (#28077) 2024-02-09 11:27:49 +01:00
Frédéric FRANCE
e4c7b019ca
fix warning (#28080) 2024-02-09 11:27:30 +01:00
Frédéric FRANCE
77ece35494
fix warning (#28081) 2024-02-09 11:27:13 +01:00
Frédéric FRANCE
3a318f8db4
fix warning (#28082) 2024-02-09 11:26:58 +01:00
Frédéric FRANCE
df1a417ec5
fix phpdoc (#28086) 2024-02-09 11:26:20 +01:00
Lucas Marcouiller
0db2ba62e8
Fix email collector add Repy to in ticket description (#28088)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-09 11:25:39 +01:00
Regis Houssin
fb69347ea7
FIX CVE-2024-23817 (#28089)
* FIX CVE-2024-23817

* FIX syntax error
2024-02-09 11:24:57 +01:00
Laurent Destailleur
9d7d74babc FIX Use of MAIN_BUILD_LOGIN_RULE and
MAIN_USER_SEPARATOR_CHAR_FOR_GENERATED_LOGIN
2024-02-08 16:28:24 +01:00
Yacine Ahmaich
9bde54a02b
fix: auto generated user login 'undefined' appears on login input)[fi… (#28012)
* fix: auto generated user login 'undefined' appears on login input)[fix: auto generated user login 'undefined' appears on login input

When We enter a lastname then we enter a firstname the generated login looks fine
Example:
    - lastname = Yacine
    - firstname = Ahmaich
    - login = yahmaich
But if we clear the firstname or the lastname we got
    - lastname = Yacine
    - firstname =  // we clear the value of firstname
    - login = yundefined

I fix the issue and also add a dot in the generated login because 'y.ahmaich' as login looks better than 'yahmaich'

* feat: add a configuration constant  of separator char  for generated login.

use constant **MAIN_USER_SEPARATOR_CHAR_FOR_GENERATED_LOGIN** to specify a separator for the auto generated login
2024-02-08 15:57:35 +01:00
Laurent Destailleur
6546892743 Debug import of agenda events 2024-02-08 15:41:05 +01:00
atm-sami
564c341af3
New import actioncomm and add fields to export (#27184)
* add import for events and more fields to export also

* update

* update to allowed mutli entity# Veuillez saisir le message de validation pour vos modifications. Les lignes

* update

* Update import_csv.modules.php

* update

* Update modAgenda.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 15:31:27 +01:00
atm-lena
bb58216801
Replenish : Calcul virtual stock by warehouse (#27668)
* Calcul virtual stock by warehouse

* Add conf STOCK_ALLOW_VIRTUAL_STOCK_PER_WAREHOUSE

* Delete translation

* Clean Code

* phpcbf

* Revert "phpcbf"

This reverts commit 8e38c525329c097dcd072f209e0a7baebd87184b.

* Clean code

* Clean code

* getDolGlobalString()

* Clean code

* Update product.class.php

* Update product.class.php

* Update replenish.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: x <x@x.x>
2024-02-08 15:15:18 +01:00