Commit Graph

94477 Commits

Author SHA1 Message Date
Laurent Destailleur
026e454825 Merge pull request #16208 from frederic34/ecmpicto
add ecm picto in left menu
2021-02-08 15:04:42 +01:00
Laurent Destailleur
7acbaad8cf Merge pull request #16212 from Hystepik/develop#3
Fix search by statut in list of holiday module
2021-02-08 15:03:31 +01:00
lmarcouiller
13b83e3150 Fix search by statut in list of holiday module 2021-02-08 09:47:43 +01:00
Frédéric FRANCE
b43dfe1139 add ecm picto in left menu 2021-02-07 22:04:46 +01:00
Laurent Destailleur
fc30b91960 Fix warning 2021-02-07 21:56:57 +01:00
Laurent Destailleur
e474ee4d16 Fix add missing field 2021-02-07 21:30:46 +01:00
Laurent Destailleur
1f32d4a815 Avoid warning 2021-02-07 21:21:21 +01:00
Laurent Destailleur
dbabd12745 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-07 20:16:56 +01:00
Laurent Destailleur
8bda726619 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/notify/card.php
2021-02-07 20:16:13 +01:00
Laurent Destailleur
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +01:00
Laurent Destailleur
899ae37f42 Merge pull request #16197 from CaringDev/noAutocompleteCaptcha
prevent browsers from storing / suggesting old captchas
2021-02-07 20:04:32 +01:00
Laurent Destailleur
92e67b2c54 Merge pull request #16195 from frederic34/morepictomodule
add more picto for module
2021-02-07 20:01:36 +01:00
Laurent Destailleur
92d40d065a Merge pull request #16207 from frederic34/patch-4
fix html
2021-02-07 20:01:03 +01:00
Laurent Destailleur
ec394a93f6 Merge pull request #16191 from grandoc/develop
fix typo
2021-02-07 19:59:54 +01:00
Laurent Destailleur
14241148f4 Merge pull request #16193 from frederic34/phpmin
update phpmin version
2021-02-07 19:59:35 +01:00
Laurent Destailleur
cb94216098 Merge pull request #16205 from atm-maxime/fix_supp_inv_list_leftjoin
Fix #15940 mixing different joins
2021-02-07 19:58:33 +01:00
Laurent Destailleur
dcae054352 Merge pull request #16202 from frederic34/patch-2
remove var not used
2021-02-07 19:57:25 +01:00
Laurent Destailleur
84a4d8f8f1 Merge pull request #16201 from frederic34/patch-1
fix html
2021-02-07 19:56:56 +01:00
Laurent Destailleur
caea73b1f2 Merge pull request #16204 from frederic34/nbsp
fix html
2021-02-07 19:56:34 +01:00
Laurent Destailleur
c24a8a22d5 Merge pull request #16203 from frederic34/patch-3
fix phpcs
2021-02-07 19:56:07 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems
Conflicts:
	htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Frédéric FRANCE
dbe5c23ed5 Update box_produits_alerte_stock.php 2021-02-07 19:45:18 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Frédéric FRANCE
58a39a263b Update box_produits.php 2021-02-07 19:44:09 +01:00
Frédéric FRANCE
ebe7e1464a fix html 2021-02-07 19:38:46 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Frédéric FRANCE
c3d1f3de3c fix html 2021-02-07 19:12:26 +01:00
Frédéric FRANCE
e0b2e26da6 fix html 2021-02-07 19:05:10 +01:00
Frédéric FRANCE
8d49ca9f0d fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
05c7bcf70f Update perms.php 2021-02-07 18:45:34 +01:00
Frédéric FRANCE
b4e6a49930 Update card.php 2021-02-07 18:35:03 +01:00
Frédéric FRANCE
b3dc87f3b7 fix phpcs 2021-02-07 18:31:31 +01:00
Frédéric FRANCE
4b6d3d0020 Update dynamic_prices.php 2021-02-07 18:25:48 +01:00
Frédéric FRANCE
d5ffbae3b3 Update admin_hrm.php 2021-02-07 18:24:30 +01:00
Frédéric FRANCE
9aca5f0535 Update propal.php 2021-02-07 18:21:39 +01:00
Frédéric FRANCE
e37ca613d2 Update prelevement.php 2021-02-07 18:20:46 +01:00
Frédéric FRANCE
8d90063e8f Update paymentbybanktransfer.php 2021-02-07 18:19:57 +01:00
Frédéric FRANCE
51da7273a4 Update payment.php 2021-02-07 18:18:45 +01:00
Frédéric FRANCE
b74ea17dd2 fix html 2021-02-07 18:14:50 +01:00
Laurent Destailleur
536ddd4832 Fix look and feel v13 2021-02-07 17:54:20 +01:00
Laurent Destailleur
a31c930522 Fix look and feel v13 2021-02-07 17:53:42 +01:00
Laurent Destailleur
03124870cd Responsive 2021-02-07 17:52:35 +01:00
Laurent Destailleur
36fbba2ac2 Make page to setup notification simpler 2021-02-07 17:40:14 +01:00
Laurent Destailleur
f62b4c15e8 Fix bad html 2021-02-07 17:32:54 +01:00
Laurent Destailleur
5712d255b3 Fix bad html 2021-02-07 17:31:40 +01:00
Laurent Destailleur
d4df62f1da Look and feel v14 2021-02-07 17:25:41 +01:00
Frédéric FRANCE
0bfe55c3d2 add picto mail 2021-02-06 17:26:16 +01:00
Frédéric FRANCE
b96e405717 add picto member 2021-02-06 17:18:00 +01:00
Raphael Schweizer
0be168561f prevent browsers from storing / suggesting old captchas 2021-02-06 16:10:05 +01:00
Frédéric FRANCE
3bcf795d55 add more picto for module 2021-02-06 14:44:08 +01:00