Commit Graph

94477 Commits

Author SHA1 Message Date
Frédéric FRANCE
eaaefe1382 5.5 to 5.6 2021-02-06 14:12:22 +01:00
Frédéric FRANCE
4249abb2de phpcs 2021-02-06 13:57:11 +01:00
Frédéric FRANCE
7860ffa28e update phpmin version 2021-02-06 13:48:31 +01:00
Philippe GRAND
b77398b476 fix typo 2021-02-06 13:12:39 +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
Philippe GRAND
4647f279d1 fix typo 2021-02-06 13:04:16 +01:00
Laurent Destailleur
4411497112 FIX #16156 2021-02-06 12:27:27 +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
b2ea91e0cc prefix can be null 2021-02-06 10:46:15 +01:00
Frédéric FRANCE
874c60035f modules can add prefix for menu 2021-02-06 10:23:17 +01:00
Frédéric FRANCE
38863200f2 modules can add prefix for menu 2021-02-06 10:20:35 +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
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
2021-02-06 01:14:48 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/card.php
2021-02-06 01:03:31 +01:00
Laurent Destailleur
c888ce08c1 Merge pull request #16174 from atm-florianm/fix/10.0_check_withdrawal_already_credited_before_crediting_it
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
2021-02-06 01:00:56 +01:00
Laurent Destailleur
7d14cde45e Merge pull request #16173 from fappels/11_backport_price_patch
FIX: Add critical price patch from 12 to 11.
2021-02-06 00:59:52 +01:00
Laurent Destailleur
d8c262691b Merge pull request #16175 from nicolas-eoxia/12_fix_missing_hook
fix: add missing hook addMoreActionsButtons in viewcat.php
2021-02-06 00:43:52 +01:00
Laurent Destailleur
bee0849290 Fix when nothing found, we should show message nothing found 2021-02-06 00:42:53 +01:00
Laurent Destailleur
c15deff817 FIX #16185 2021-02-06 00:30:44 +01:00
werewolf7160
83f24e6fd2 call to createCommon() return int and not bool
with generated Object, the post request call to createCommon() in it and taht function return a int (id or -1 if error).
but the test on the returned value is a '!', that don't return false on "-1".
a post request with an sql error for example(foreign key error for my test), will always return 200 instead of 500 with the error
2021-02-06 00:21:53 +01:00
Laurent Destailleur
91996378d9 Merge pull request #16178 from werewolf7160/patch-1
call to createCommon() return int and not bool
2021-02-06 00:20:29 +01:00
Laurent Destailleur
f823ee019a Merge pull request #16181 from ptibogxiv/patch-411
FIX takepos : load date function
2021-02-06 00:19:38 +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
7b35192476 Fix bad label 2021-02-06 00:15:07 +01:00
Laurent Destailleur
fbab50e4cb Merge pull request #16182 from ptibogxiv/patch-412
Update libelle as label in shipment method API
2021-02-06 00:14:49 +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
ptibogxiv
03a5f06d50 Update libelle as label in shipment method API 2021-02-05 17:37:51 +01:00
ptibogxiv
4477578766 FIX takepos : load date function
fix loading dol_get_first_hour()
2021-02-05 17:30:41 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +01:00