Commit Graph

25892 Commits

Author SHA1 Message Date
Florian HENRY
377427da1d add hook to custom directory into automatic file ECM 2021-02-06 13:25:35 +01:00
Florian HENRY
3b4f8c32f7 add hook to custom directory into automatic file ECM 2021-02-06 13:21:16 +01:00
Philippe GRAND
ce7a3ae2f0 fix typo 2021-02-06 13:11:58 +01:00
Philippe GRAND
04373fb531 fix typo 2021-02-06 13:11:08 +01:00
Philippe GRAND
bf211c6423 fix typo 2021-02-06 13:10:00 +01:00
Florian HENRY
901b3287a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto 2021-02-06 12:41:59 +01:00
Florian HENRY
fcb5b3900d FIX: #16189, fix download/see check deposit PDF 2021-02-06 12:39:40 +01:00
Laurent Destailleur
7b72ac5a7a Look and feel v14 2021-02-06 12:10:27 +01:00
Laurent Destailleur
3dedd81f37 Same width for all picto of menu 2021-02-06 11:56:27 +01:00
Laurent Destailleur
c1eba5a885 Merge pull request #16188 from frederic34/menuprefix
modules can add prefix for menu
2021-02-06 11:41:46 +01:00
Frédéric FRANCE
b487644cb7 sample use for margin module 2021-02-06 10:52:03 +01:00
Frédéric FRANCE
df67de08b1 modules can add prefix for menu 2021-02-06 10:16:07 +01:00
Laurent Destailleur
a2a2127953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-06 01:17:16 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Laurent Destailleur
b2aab07842 Merge pull request #16180 from grandoc/new_branch_05_02_2021
update minimum version
2021-02-06 00:19:17 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Philippe GRAND
b2e61aa499 fix typo 2021-02-05 18:23:17 +01:00
Philippe GRAND
47ca631193 Save the name of generated file as the main doc when generating a doc with this template and missing declarations 2021-02-05 18:09:36 +01:00
Philippe GRAND
5b5ea075e7 Save the name of generated file as the main doc when generating a doc with this template and missing declarations 2021-02-05 18:07:02 +01:00
Philippe GRAND
5856f9e5cb Save the name of generated file as the main doc when generating a doc with this template and missing declarations 2021-02-05 18:04:46 +01:00
Philippe GRAND
4170332aee Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:58:54 +01:00
Philippe GRAND
0f196d7f19 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:56:57 +01:00
Philippe GRAND
e638c238c6 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:54:51 +01:00
Philippe GRAND
7c13428456 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:53:34 +01:00
Philippe GRAND
c03da95acb Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:52:12 +01:00
Philippe GRAND
d85c8c44fc Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:49:43 +01:00
Philippe GRAND
998c5b2ec3 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:42:33 +01:00
Philippe GRAND
c96d36cad3 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:39:22 +01:00
Laurent Destailleur
482ad20a4d Log debug before archive logs 2021-02-05 16:14:42 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f Fix autoselect of category with 'auto' 2021-02-05 15:07:07 +01:00
Laurent Destailleur
2851bac0af Fix param urlencode 2021-02-05 14:46:20 +01:00
Laurent Destailleur
ac83cea83a Fix avoid to run import twice by clicking on tab step6
Fix timeout for real import step
2021-02-05 14:34:04 +01:00
Florian HENRY
df7f18d4d2 add hook to add directory into ECM auto files 2021-02-05 13:33:48 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
21a9a69ba1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/SecurityTest.php
2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
42557a0148 Memory optimization in blockedlog module 2021-02-04 23:03:09 +01:00
Laurent Destailleur
a4f6c2d0c6 More log 2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea Look and feel v14 2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Laurent Destailleur
1b7ee97082 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-04 19:49:32 +01:00
Laurent Destailleur
87a12b39b0 Fix css 2021-02-04 19:28:49 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
a6b08b241f Doc 2021-02-04 17:13:00 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
524b28d8c3 Fix missing tab info on holiday 2021-02-04 12:15:31 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired
FIX Bad dates on info tabs
2021-02-04 11:56:53 +01:00