Commit Graph

590 Commits

Author SHA1 Message Date
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
92b9527ac0 Restore ignore file 2024-02-07 19:32:30 +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
MDW
4d0fbc657e Qual: Backport pre-commit to 19.0 (#27950)
* Qual: Backport pre-commit to 17.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.

* Qual: Backport pre-commit to 18.0

# Qual: Backport pre-commit to 18.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.

* Qual: Backport pre-commit to 19.0

# Qual: Backport pre-commit to 19.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.
2024-02-01 17:37:25 +01:00
Laurent Destailleur
ab52890e34 Merge branch 'develop' into dict/GETPOST_filter 2024-01-24 14:32:22 +01:00
Laurent Destailleur
bae64d11a3 Update codespell-dict.txt 2024-01-24 14:30:23 +01:00
MDW
a5648c0fb9 Qual: Add GETPOST filter misspellings to dict
Add some misspellings following observations for GETPOST filter.
Currently codespell does not check words in strings using single
quote delimiters, hopefully that evolves.
2024-01-23 20:37:18 +01:00
Frédéric France
9147b2aa70 translate comments 2024-01-23 20:26:40 +01:00
Frédéric FRANCE
f0ccb42e1f Merge branch 'develop' into patch-14 2024-01-23 20:01:53 +01:00
Laurent Destailleur
a21728473e Merge branch 'develop' into patch-15 2024-01-23 19:16:47 +01:00
Frédéric FRANCE
8912bc893c Update codespell-dict.txt 2024-01-23 16:35:55 +01:00
Frédéric FRANCE
3b26df5afd Update codespell-dict.txt 2024-01-23 16:22:50 +01:00
Frédéric FRANCE
8ab3120d6e Update codespell-dict.txt 2024-01-23 14:16:37 +01:00
Laurent Destailleur
d7971d3d3e Complete codespell dic 2024-01-23 10:37:19 +01:00
MDW
c6adc6eaf4 Fix: addCodespellIgnores.sh regex was broken. 2024-01-22 11:42:10 +01:00
Laurent Destailleur
b82c518277 Merge pull request #27703 from mdeweerd/spelling/script_and_dict
Qual: codespell: Limit adding exceptions to git files only
2024-01-21 17:26:36 +01:00
MDW
37620bcbbe NEW: dev: Add tool to update licence with developer info
This is a tool in php to update license information in the header
base on the git user setting.
2024-01-21 16:36:08 +01:00
MDW
39bbe766b5 Qual: codespell: Limit adding exceptions to git files only
addCodespellIgnores.sh was applied on all files, now limit to
git controlled files only.
2024-01-21 16:35:43 +01:00
Laurent Destailleur
c78cd05818 Merge pull request #27638 from mdeweerd/qual/admin_lib
Qual: Cleanup method to ignore misspelled key
2024-01-20 00:42:41 +01:00
Laurent Destailleur
e5b9f03e8c Fix to avoid #yogosha20013 2024-01-19 16:02:13 +01:00
MDW
eb8960bcd1 Qual: Cleanup method to ignore misspelled key
# Qual: Cleanup method to ignore misspelled key

With the method to ignore lines, the code can be cleaned up to ignore
the spelling issue.
2024-01-18 23:08:08 +01:00
MDW
91a648fa3e doc: codespell - Add some more instructions
# Qual: Add some more instructions to the 'codespell' ignore script.

As codespell will likely be run from pre-commit where codespell
is installed in a venv for the user, running addCodespellIgnores.sh
from the CLI requires installation of codespell for the developer's
environment.
This add some information inside the script about that.
2024-01-17 11:06:12 +01:00
Laurent Destailleur
1bd3777a80 Fix phpstan 2024-01-15 03:16:05 +01:00
Laurent Destailleur
699f0889c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-15 03:08:38 +01:00
Laurent Destailleur
d85ab489f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 02:54:59 +01:00
Laurent Destailleur
c94165067c Swith to level 3 of phpstan 2024-01-15 02:54:44 +01:00
MDW
dfc263ced5 Fix: github_lines_byuser.sh - resolve issue with iconv
# Fix: github_lines_byuser.sh - resolve issue with iconv

iconv could not convert certain characters and truncated the output.
That is fixed.
The script was improved by adding a variable, cleaning up and hence
also fixing shellcheck warnings.
2024-01-14 21:56:47 +01:00
MDW
8171fe73d1 Fix: tools: Small fix with regards to path issue detection 2024-01-14 19:18:31 +01:00
Laurent Destailleur
f29e80d186 Try to move files from root in dedeicated dir (#27503) 2024-01-14 18:39:22 +01:00
MDW
43bb558ae9 Fix: pre-commit: Skip branch check in ci (+used sed in codespell exceptions generation) (#27499)
* Use 'sed' instead of 'perl' (sed is more common)

* Skip branch check in ci
2024-01-14 15:00:01 +01:00
MDW
5bfccb7016 Qual: Add pre-commit & codespell (#27392)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-14 14:24:29 +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
MDW
90b2a65589 Improve 2 of the github scripts (#27493) 2024-01-14 12:15:47 +01:00
Laurent Destailleur
a985446257 Fix git tools 2024-01-13 18:51:00 +01:00
Laurent Destailleur
7a4d84a9f7 apstats 2024-01-13 15:28:11 +01:00
Laurent Destailleur
f5ae841af1 css 2024-01-13 15:27:04 +01:00
Laurent Destailleur
93c4201516 apstats 2024-01-13 15:25:10 +01:00
Laurent Destailleur
446eb9211d apstats 2024-01-13 15:20:28 +01:00
Laurent Destailleur
463b36de36 apstats 2024-01-13 15:13:00 +01:00
Laurent Destailleur
fbf9e78059 Fix css 2024-01-13 15:10:13 +01:00
Laurent Destailleur
9b7a2b2814 apstats 2024-01-13 15:09:15 +01:00
Laurent Destailleur
2d9e9916ba apstats 2024-01-13 15:06:49 +01:00
Laurent Destailleur
42e92e0ca2 apstats 2024-01-13 14:57:08 +01:00
Laurent Destailleur
ced1fad3fc Fix apstats 2024-01-13 14:55:21 +01:00
Laurent Destailleur
fd76618d9c Enhance apstats 2024-01-13 14:31:31 +01:00
Laurent Destailleur
5f8fd2d15c Fix message 2024-01-13 14:23:20 +01:00
Laurent Destailleur
8b5f84ec4b Fix params 2024-01-13 14:22:05 +01:00
Laurent Destailleur
4fec90da3e Rename shell tools 2024-01-13 14:19:58 +01:00
Laurent Destailleur
cac0ef5cf0 Dev 2024-01-13 14:06:03 +01:00
Laurent Destailleur
9798ea1e01 Enhance script for git stats 2024-01-13 14:00:30 +01:00