Commit Graph

3048 Commits

Author SHA1 Message Date
Laurent Destailleur
2b5b9957c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-13 10:44:49 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
0020b8782f
Merge pull request #21222 from ptibogxiv/patch-19
Fix php8 compatibility
2022-06-12 21:00:41 +02:00
ptibogxiv
fe557ce9db
Update bank.php 2022-06-12 20:41:27 +02:00
Laurent Destailleur
19a8fd0b73
Update card.php 2022-06-12 18:40:21 +02:00
ptibogxiv
e82c01d24e
Fix php8 compatibility 2022-06-12 14:48:14 +02:00
ptibogxiv
7d35e94fc5
Fix php8 compatibility 2022-06-12 14:41:06 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
1ef66c208f
Update card.php 2022-06-01 19:34:29 +02:00
stickler-ci
adb37a5f5f Fixing style errors. 2022-06-01 09:53:51 +00:00
Quentin VIAL-GOUTEYRON
682da1fabe FIX if password doesnt match rule it created a user without password 2022-06-01 11:33:15 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Regis Houssin
82e19879d5 FIX php8.1 warning 2022-05-21 23:43:01 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
ddf9c06e2c Debug v16 2022-05-18 17:06:42 +02:00
Laurent Destailleur
d22ba9aa66 css 2022-05-18 17:02:50 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
Laurent Destailleur
8d84ccfe01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/theme/eldy/global.inc.php
2022-05-17 23:30:48 +02:00
Laurent Destailleur
ddd0848acc Look and feel v16 2022-05-17 01:21:33 +02:00
Florian HENRY
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
Laurent Destailleur
6106d54632 css 2022-05-13 09:54:10 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
8023e1b0cd Debug v16 2022-04-30 20:41:18 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all   entities. 2022-04-29 13:10:28 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
ebe68350d1 IP for last and previous login is now saved inuser table 2022-04-28 17:34:04 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
031669493d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:35 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length
FIX: user employee tab: offset in open days messes up holiday length calculation
2022-04-14 22:59:20 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
8f3335f75d CSS 2022-04-11 21:17:35 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 20:57:16 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/user/card.php
2022-04-11 20:43:20 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00