Commit Graph

150 Commits

Author SHA1 Message Date
Laurent Destailleur
cbc28b0afd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-08-01 14:02:36 +02:00
Laurent Destailleur
269a8a2fa1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-01 13:36:59 +02:00
Laurent Destailleur
faac9602f8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-08-01 13:31:51 +02:00
Francis Appels
dc58a90a48 Fix modulebuilder MAIN_ODT_AS_PDF (#30496) 2024-07-31 15:35:15 +02:00
Laurent Destailleur
871e01d955 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 14:32:55 +02:00
Laurent Destailleur
09eaf38bd1 Fix phpstan 2024-07-31 14:31:29 +02:00
Laurent Destailleur
d2bd6a03ec Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 13:21:02 +02:00
Laurent Destailleur
2f7a252244 Fix warnings 2024-07-31 13:09:10 +02:00
Laurent Destailleur
038ce032e0 Fix tooltip on numbering modules 2024-07-31 12:40:24 +02:00
Laurent Destailleur
a701f84543 Fix tooltip on numbering modules 2024-07-31 12:14:39 +02:00
Laurent Destailleur
c9b92bb32d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 18:21:47 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Thibault Fiacre
7c9e6b1fb9 FIX lang output for sales representative on PDF (#30469) 2024-07-25 17:56:13 +02:00
Frédéric FRANCE
2707475a12 fix phpstan (#30319)
* fix phpstan

* fix phpstan expects int, false given ...

* fix phpstan expects int, true given ...
2024-07-08 21:45:35 +02:00
Frédéric FRANCE
29f223fd3c fix checkFunctionArgumentTypes (#30249)
* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes

* fix checkFunctionArgumentTypes
2024-07-04 17:47:31 +02:00
Frédéric FRANCE
74806473ab fix cti (#29842)
* fix cti odt asset

* comment unused code in template

* phpdoc

* fix unreachable code

* fix unreachable code

* fix not falsy
2024-06-05 14:55:07 +02:00
Frédéric FRANCE
d7a88a40a2 fix cti in odt template (#29840)
* fix cti in odt template

* fix cti in odt recruitment
2024-06-04 19:29:25 +02:00
Laurent Destailleur
48c5d9b0bc Debug v20 2024-05-29 12:26:04 +02:00
MDW
baaa7c721e Fix PHPdoc typing ($cols, $phpmin) 2024-03-24 14:19:09 +01:00
Laurent Destailleur
e9a0905fba Use same return 2024-02-13 11:14:11 +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
MDW
39769482b1 Qual: Fix typing hints for DoliDB (#27484)
# Qual: Fix typing hints for DoliDB

This should help the static tools for type and method checking.
2024-01-13 15:50:02 +01:00
MDW
591306d7b1 Qual: Spelling htdocs/[l-o]* & htdocs/pa* (#27435)
# Qual: Fix spelling htdocs/[l-o]* & htdocs/pa*

Mostly comments, some local variables changed and translations to avoid
automatic fixes.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-12 18:06:50 +01:00
Charlène Benke
d5c7d8dcdf Update mod_myobject_standard.php 2023-12-30 08:26:04 +01:00
Laurent Destailleur
1c9429643a Fix php-cs 2023-12-04 13:46:42 +01:00
Laurent Destailleur
240869f2f2 Fix warnings 2023-11-30 21:45:58 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
Laurent Destailleur
6cdb7c929a Debug v19 2023-11-10 15:10:41 +01:00
Laurent Destailleur
bc89f535b1 Qual: Clean code 2023-09-13 11:36:44 +02:00
Frédéric FRANCE
98388e3bd4 phpstan 2023-09-12 12:28:53 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
Florian HENRY
3db024e6b5 fix travis 2023-08-28 14:33:02 +02:00
Laurent Destailleur
5d4f53046a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-27 18:18:34 +02:00
Laurent Destailleur
8fa06ccfa7 Fix empty and getDolGlobal... 2023-08-27 17:11:28 +02:00
Florian HENRY
5deaaa08a2 fix review 2023-08-25 09:10:47 +02:00
HENRY Florian
1cbe8c9327 Update doc_generic_myobject_odt.modules.php 2023-08-23 20:08:58 +02:00
HENRY Florian
f255fac000 Update doc_generic_myobject_odt.modules.php 2023-08-23 20:06:42 +02:00
Laurent Destailleur
24040c78bb Tooltip for help in ODT doc generation setup is now clickable 2023-08-18 01:46:54 +02:00
Laurent Destailleur
a4d04b84f5 css 2023-08-18 01:06:47 +02:00
Florian HENRY
e387e009bf fix: use of getDolGlobal in module builder template 2023-08-16 11:59:14 +02:00
Laurent Destailleur
db2a70b86a NEW Factorize a lot of code for numbering modules 2023-08-09 14:50:28 +02:00
Laurent Destailleur
df76b9940d Debug v18 2023-08-05 13:27:56 +02:00
Laurent Destailleur
9fd651ee5c FIX warnings 2023-07-30 19:46:23 +02:00
Florian HENRY
3624e0efe3 again check php 8 review 2023-06-09 11:02:46 +02:00
Florian HENRY
ce10c68d31 getDol rather than ->global 2023-06-08 22:38:11 +02:00
Laurent Destailleur
66393753c4 Clean code - fix warnings 2023-05-30 13:29:57 +02:00
Laurent Destailleur
76ab7136f2 Clean code 2023-03-19 15:22:21 +01:00
FLIO
29e56ab3cf fix (qodana) edit error and merge develop to be update 2023-02-21 17:51:24 +01:00