Commit Graph

71 Commits

Author SHA1 Message Date
Frédéric France
86e1625793
fix phpstan 2025-01-06 18:27:30 +01:00
Laurent Destailleur (aka Eldy)
352d156dd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-12-08 17:07:14 +01:00
Laurent Destailleur (aka Eldy)
774a48fa29 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-08 16:53:21 +01:00
Florian HENRY
8c85933da9 fix: various fix on broken extrafields managnement on advtargetemailing 2024-12-03 15:41:17 +01:00
Florian HENRY
b10483ddc8 fix: various fix on broken extrafields managnement on advtargetemailing 2024-12-03 15:41:07 +01:00
Florian HENRY
6c34431336 fix: various fix on broken extrafields managnement on advtargetemailing 2024-12-03 15:36:07 +01:00
Florian HENRY
e61da22458 fix: various fix on broken extrafields managnement on advtargetemailing 2024-12-03 15:27:45 +01:00
MDW
0ac595364b
Qual: Fix phan/phpstan notices in class files (part 1) (#31501)
* Ignore phpstan configuration for spelling

* Qual: Fix phan notices in class files
2024-10-25 21:00:02 +02:00
Laurent Destailleur
ff4344d5c8 Clean code 2024-10-24 01:12:58 +02:00
Laurent Destailleur
65edbd5f9f FIX better compatibility with some old extrafield syntax filter 2024-09-16 15:50:47 +02:00
MDW
daf2d36bcd
PHPdoc typing 2024-03-24 11:03:05 +01:00
MDW
04b3ed0c7e
Fix extrafeild typo 2024-03-24 11:03:03 +01:00
Laurent Destailleur
5541560e1c Fix phan warnings 2024-03-24 05:44:55 +01:00
brad
5d02743f21 Merge branch 'fix-add-state-province-filter-field' of github.com:bradley-jarvis/dolibarr into fix-add-state-province-filter-field 2024-03-22 15:37:57 +11:00
brad
d351005cb1 FIX Add state/province filter to email adv select 2024-03-22 15:19:18 +11: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
1d00d90872
Merge pull request #25740 from atm-thibaultf/NEW_hide_external_user_in_combobox
NEW : hide external user in combobox
2024-01-15 21:59:30 +01:00
MDW
a04f2bf4e7
Qual: Spelling fixes that newly appeared. (#27495)
* Qual: Spelling fixes that newly appeared.

# Qual: Fix spelling erros that appeared since the bulk updates.

These issues mostly appeared since the bulk updates (a few ones were postponed
to make sure no real spelling errors were missed.)

* Update modulebuilder.lib.php

* Update pdf_standard.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-14 12:26:37 +01:00
Laurent Destailleur
910a541c60 Clean code 2024-01-09 13:08:22 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
atm-thibaultf
199e5c1a46 NEW hide external and non employee users in combobox 2023-09-05 14:34:21 +02:00
atm-thibaultf
b2ae991501 NEW_hide_external_user_in_combobox 2023-08-30 17:08:57 +02:00
Florian HENRY
3777b7dffe fix: [AdvTargetEmailling] bad table from select and use of dict for prospect status 2022-10-03 13:38:15 +02:00
Laurent Destailleur
87230795cc Fix warning 2022-06-03 14:23:37 +02:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
e59ac41182 Fix phpcs 2020-02-17 13:59:44 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
d487f6b84d Clean code 2019-11-22 14:10:12 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
9b165f6b3f
add visibility 2019-02-27 20:45:07 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00