2
0
forked from Wavyzz/dolibarr
Commit Graph

2409 Commits

Author SHA1 Message Date
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-28 18:52:44 +02:00
Anthony Berton
d8ae2361a9 NEW - Add user right order generete doc 2022-07-28 11:29:36 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
Laurent Destailleur
122c27885f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-25 10:29:11 +02:00
Laurent Destailleur
8fb7d129c9 Trans 2022-07-25 00:36:38 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
lvessiller
ba1a607afc FIX resolve conflicts 2022-07-20 14:21:24 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-07-16 02:26:35 +02:00
Laurent Destailleur
07216577e4 FIX #yogosha11806 2022-07-16 02:03:38 +02:00
lvessiller
cda6e9184d NEW color in action list and translated 2022-07-13 16:52:57 +02:00
bagtaib
147140bdc2 Show/hide advanced Options 2022-07-08 05:55:23 +02:00
Laurent Destailleur
9a10e3f971 Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
3e66ca1636 NEW #21395 : Added picto text to inform that option does not work with all themes 2022-06-27 16:18:54 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00
Laurent Destailleur
e698d20789 Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Laurent Destailleur
e5172b550d FIX #21305 Better fix 2022-06-17 12:38:17 +02:00
Hystepik
45439e055c Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
41683b9025 Typo 2022-06-08 18:09:21 +02:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3 Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias
NEW - Add option pdf global thirdparty alias
2022-06-07 10:43:18 +02:00
Laurent Destailleur
f475991b20 Typo 2022-06-03 13:56:28 +02:00
Laurent Destailleur
a9ea1c8fbb More logs 2022-06-03 13:51:47 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
af6a025caa css 2022-06-03 11:34:19 +02:00
Laurent Destailleur
b9a05ded29 Typo 2022-06-02 12:48:05 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Laurent Destailleur
6de1f6bbac Generic message 2022-05-23 15:12:15 +02:00
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
Laurent Destailleur
420feba56f Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Laurent Destailleur
c4f4754b5b Add option EMAIL_ALTERNATIVE_HOST_SIGNATURE 2022-05-10 19:23:30 +02:00
Laurent Destailleur
86b4c97287 Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules
Trans debugbar
2022-05-03 12:08:24 +02:00
Hystepik
0be15e3c74 Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
lmarcouiller
13e05b875d remove unused files 2022-05-02 15:07:41 +02:00
Laurent Destailleur
b7106b1731 Fix lang 2022-05-01 22:22:46 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
9af68679d1 Merge branch 'develop' into 16a20 2022-05-01 12:45:08 +02:00
Laurent Destailleur
fe2324ac7e Merge pull request #20669 from ymollard/tickets-collector
FIX and NEW i18n for creating tickets via the mail collector
2022-05-01 12:36:16 +02:00