Commit Graph

39551 Commits

Author SHA1 Message Date
Vincent Maury
e89f93024f NEW #24031 add option MAIN_GRANDTOTAL_LIST_SHOW to always show grand total to lists (#27247)
* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option selected - grand total to lists

* Update ihm.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 05:34:45 +01:00
Laurent Destailleur
9a1afee6d2 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-12 03:36:46 +01:00
Laurent Destailleur
f6dd2f808e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-12 03:35:51 +01:00
Laurent Destailleur
ff2d609814 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_production.php
2024-02-12 03:35:39 +01:00
Laurent Destailleur
2e620c9a43 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-12 03:33:09 +01:00
Laurent Destailleur
65533360a2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/main.inc.php
2024-02-12 03:32:58 +01:00
Laurent Destailleur
a2d2247d0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-12 02:52:52 +01:00
Laurent Destailleur
1caf853528 Work on website templates from modules 2024-02-12 02:52:35 +01:00
MDW
6e39bcba33 Qual: Fix spelling (#28130)
# Qual: Fix spelling

Fix some spelling issues detect by codespell
2024-02-12 02:02:18 +01:00
Laurent Destailleur
2880738255 Work on websitetemplates 2024-02-12 01:54:15 +01:00
Laurent Destailleur
9abdc1229a Fix test to execute workflow actions. Add more info in trigger errors. 2024-02-10 21:25:26 +01:00
MDW
2e254892ea Qual: Clean up codespell exceptions (#28104)
The files with exceptions can be updated as there are many less cases to
exclude.

In the project files there are a few minor spelling corrections, and
`$scrit` was changed to `$search_crit` to avoid a spelling suggestion.
2024-02-10 17:27:36 +01:00
Frédéric FRANCE
ad759c4826 fix warnings (#28103) 2024-02-10 17:25:43 +01:00
Frédéric FRANCE
65b4919368 fix warning (#28102) 2024-02-10 17:25:30 +01:00
Frédéric FRANCE
e93d184218 fix warning (#28100) 2024-02-10 17:25:11 +01:00
Laurent Destailleur
6d90df8ea0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-10 10:38:42 +01:00
William Mead
92afb654db Fixed default value for radio extrafield (#27066) 2024-02-10 01:58:36 +01:00
lvessiller-opendsi
5092d17d2a NEW determine multi-currency price on object line create tpl (#28021) 2024-02-10 01:09:24 +01:00
Laurent Destailleur
4c267ec251 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 19:07:34 +01:00
Laurent Destailleur
e0d8bf04b5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-09 19:07:24 +01:00
Laurent Destailleur
c261b84667 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 19:06:52 +01:00
Laurent Destailleur
31816168da Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-09 19:05:49 +01:00
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
lamrani abdelwadoud
e68e0283ca update function show_actions_done for list users events (#28095) 2024-02-09 19:01:45 +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
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
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
thomas-Ngr
ac6b230a86 Fix : modules templates were not fetched for linkedobjectblock (#28084) 2024-02-09 14:10:37 +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
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
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
77ece35494 fix warning (#28081) 2024-02-09 11:27:13 +01:00
Frédéric FRANCE
df1a417ec5 fix phpdoc (#28086) 2024-02-09 11:26:20 +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
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
Laurent Destailleur
7783575bf7 Fix bad parameter 2024-02-08 15:02:54 +01:00
Laurent Destailleur
49c1c42d83 Doxygen 2024-02-08 14:58:30 +01:00