2
0
forked from Wavyzz/dolibarr
Commit Graph

34632 Commits

Author SHA1 Message Date
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
Laurent Destailleur
18d05ef570 Fix phpstan 2024-02-08 14:26:49 +01:00
Lucas Marcouiller
14090f3515 New make replyto as origin_email email collector ticket part (#28040)
* New make replyto as origin_email email collector ticket part

* fix by adding a field

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 13:58:40 +01:00
Frédéric FRANCE
b92b8c443d fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
Laurent Destailleur
94cd823a7c Fix #yogosha20662 2024-02-08 06:35:04 +01:00
Libre Master
eb110f66c2 Simpler version of getRootURLFromURL (#27927)
* Simpler version

* Simpler version

* Simpler version

* Try more complete enhancement

* Update geturl.lib.php

* Simpler version

---------

Co-authored-by: Christophe TREMBLAY-GUILLOUX <christophe@libremaster.ovh>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 02:08:18 +01:00
Florian Mortgat
51efb8d1f6 NEW: FormSetupItem: show picto in front of confs applied across all entitie (#28024)
* NEW: FormSetupItem: show picto in front of confs applied across all entities

* Show globe picto only if multicompany is enabled + use img_picto instead of hard-coded HTML

* Update htdocs/core/class/html.formsetup.class.php

Missing assignment to $out
2024-02-08 01:51:25 +01:00
Laurent Destailleur
763d70cf52 Clean comment to avoid false alert with travis 2024-02-08 01:50:03 +01:00
ariel-bentu
b4543c0894 QUAL Fix PDF generation to not ignore col align. (#28022)
* QUAL Fix PDF generation to not ignore col align.

before fix, if you change a column's content's alignment in a hook - it is ignored.

* fix function documentation

* Update commondocgenerator.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 01:30:18 +01:00
Lucas Marcouiller
44aff249a8 New : displays sender email in ticket message from (#28023)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 01:28:06 +01:00
Laurent Destailleur
550e4e8c9a Fix compatibility
Conflicts:
	htdocs/resource/class/dolresource.class.php
2024-02-08 00:26:55 +01:00
Laurent Destailleur
038fcbab3d Fix compatibility 2024-02-08 00:24:27 +01:00
thibdrev
0b6467758b qual: phpstan - last errors stating "getNextValue() should return string but returns int." (#28033)
* Update mod_commande_marbre.php

htdocs/core/modules/commande/mod_commande_marbre.php	152	Method mod_commande_marbre::getNextValue() should return string but returns int.

* Update mod_holiday_madonna.php

htdocs/core/modules/holiday/mod_holiday_madonna.php	150	Method mod_holiday_madonna::getNextValue() should return string but returns int.

* Update mod_project_simple.php

htdocs/core/modules/project/mod_project_simple.php	149	Method mod_project_simple::getNextValue() should return string but returns int.

* Update mod_commande_marbre.php

* Update mod_holiday_madonna.php
2024-02-08 00:22:49 +01:00
thibdrev
cb7134871b qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php (#28062)
* qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php

htdocs/compta/paiement/class/cpaiement.class.php	98	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	253	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	373	Property Cpaiement::$active (int) does not accept string.

* Update commondict.class.php
2024-02-08 00:16:22 +01:00
thibdrev
ad141c1e1f qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:44 +01:00
thibdrev
1588fc3072 qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:16 +01:00
thibdrev
c81ac78594 qual: phpstan for htdocs/core/class/commonobject.class.php (#28063)
htdocs/core/class/commonobject.class.php	9613	Method CommonObject::quote() should return string but returns int.
2024-02-08 00:14:48 +01:00
Laurent Destailleur
4d49dfc161 Qual: Removed dead code 2024-02-07 22:18:45 +01:00
Frédéric FRANCE
0972ba137d Ticket generate doc (#28031)
* add doc generation to tickets

* add doc generation to tickets

* add doc generation

* add doc generation

* add extraparams fetch

add extraparams fetch

fix call

fix call

fix call

* fix doc

* remove bad setting

* fix default settings on init

* fix template name

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-07 19:36:23 +01:00
Laurent Destailleur
3c45870bdf Clean code 2024-02-07 19:16:57 +01:00
Laurent Destailleur
eb4f53665d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
2024-02-07 18:30:10 +01:00
Laurent Destailleur
097290fc38 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/core/class/commonobject.class.php
2024-02-07 18:16:57 +01:00
Laurent Destailleur
4b60b3d991 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2024-02-07 18:11:36 +01:00
Laurent Destailleur
e6b165003f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2024-02-07 18:01:11 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Quentin-Seekness
0ad3581e00 Update cunits.class.php (#28056)
FIX: error SQL when creating a Cunit
2024-02-07 17:29:45 +01:00
William Mead
27002a95e4 Fixed undefined thirdparty_id property (#28044) 2024-02-07 16:29:57 +01:00