Commit Graph

13368 Commits

Author SHA1 Message Date
Laurent Destailleur
37bd68b27a Debug 2024-02-10 10:38:29 +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
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
09f07d3f77 Clean language files 2024-02-08 02:32:25 +01:00
Laurent Destailleur
d813bf4ae7 NEW Add option TICKET_INCLUDE_SUSPENDED_STATUS (Suspended status no more
visible by default)
2024-02-07 23:49:36 +01:00
lamrani abdelwadoud
59b3323669 NEW fuctionnality for stock configuration prompt in AI module (#28030) 2024-02-07 19:41:50 +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
c66b434c80 Fix for export 2024-02-06 18:41:45 +01:00
Laurent Destailleur
a3d0fbd279 Debug v19 2024-02-03 13:00:10 +01:00
Laurent Destailleur
61921f0364 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-01 12:24:00 +01:00
Laurent Destailleur
badf3e1971 Fix payment mode/term and label and sort order in export 2024-02-01 11:53:55 +01:00
Laurent Destailleur
f07fd31c65 Fix lang 2024-01-31 21:27:21 +01:00
Laurent Destailleur
a0d0e60600 Use the good wrapper for image when in web server mode 2024-01-31 13:01:05 +01:00
Lamrani Abdel
3cc15d4163 New display for template email in boxes 2024-01-29 15:38:13 +01:00
Laurent Destailleur
a0624e2e36 Merge branch 'develop' into features/reglementdon 2024-01-29 01:02:23 +01:00
Laurent Destailleur
38f897609d Trans 2024-01-28 17:47:50 +01:00
Laurent Destailleur
92cf4f2fd1 Mutualize code 2024-01-28 16:36:01 +01:00
Laurent Destailleur
96b5008a24 Trans 2024-01-27 18:04:12 +01:00
Laurent Destailleur
079b2aa3a0 Debug webportal 2024-01-27 17:58:19 +01:00
Laurent Destailleur
25a91c63cf Debug webportal module 2024-01-27 17:23:03 +01:00
Laurent Destailleur
9d96c6c4d3 Trans 2024-01-27 02:23:33 +01:00
Laurent Destailleur
279f9e715a WIP API 2024-01-27 02:22:25 +01:00
Laurent Destailleur
77e101e2ca Debug AI module 2024-01-27 02:04:43 +01:00
Laurent Destailleur
ea21a25633 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 22:32:44 +01:00
Laurent Destailleur
c6d59e5ddd Fix lang 2024-01-25 22:31:56 +01:00
Laurent Destailleur
0ed4aa5cdc Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 22:20:52 +01:00
Laurent Destailleur
233e5a3307 Fix trans 2024-01-25 22:19:31 +01:00
Laurent Destailleur
8d661ea411 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 21:16:24 +01:00
Laurent Destailleur
2566109648 Fix lang 2024-01-25 21:15:00 +01:00
Laurent Destailleur
d8ede0807f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 17:25:13 +01:00
Laurent Destailleur
b8686f159f Debug module receipt printer 2024-01-25 15:18:06 +01:00
Laurent Destailleur
0441b9d25c Trans 2024-01-25 13:13:08 +01:00
Laurent Destailleur
b081652c4b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 12:51:55 +01:00
Laurent Destailleur
331b13c465 Sync transifex 2024-01-25 01:15:01 +01:00
Laurent Destailleur
bbc2302f00 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-24 11:58:30 +01:00
Laurent Destailleur
3eb461db7c FIX #27771 Sec: birth date and personal address not visible by default
on vcard
2024-01-24 11:56:56 +01:00
Laurent Destailleur
0602b40e3a FIX Debug setup of module TakePOS 2024-01-24 03:34:42 +01:00
Laurent Destailleur
b51b8ab1d5 FIX Debug setup of module TakePOS 2024-01-24 03:34:03 +01:00
Laurent Destailleur
ce21af7b6c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-23 22:17:46 +01:00
Laurent Destailleur
cca01cbda4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:15:36 +01:00
Laurent Destailleur
b05d1c5f6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:03:28 +01:00
Laurent Destailleur
9a9ca50b49 Debug v19 2024-01-23 11:07:53 +01:00
Laurent Destailleur
6c6adc5333 Merge pull request #24911 from Easya-Solutions/new-productlot-make-sell-or-eat-by-mandatory2
NEW make sell or eat by mandatory in product lot
2024-01-22 15:21:34 +01:00
Laurent Destailleur
22d4752676 Fix duplicate language files 2024-01-22 15:12:30 +01:00
Laurent Destailleur
c443bd4a3d Fix duplicate key entries 2024-01-22 14:13:31 +01:00
atm-lena
6f0a91856f Missing Translations 2024-01-22 12:42:34 +01:00
MDW
ef95c56ecd Qual: Fix spelling.
# Qual: Fix some spelling
2024-01-21 13:37:53 +01:00
Laurent Destailleur
4795c40601 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-19 15:36:53 +01:00
Laurent Destailleur
3b918ad274 Tooltip 2024-01-19 11:19:43 +01:00
Laurent Destailleur
6e79bca10c Trans 2024-01-19 10:50:35 +01:00