Commit Graph

94367 Commits

Author SHA1 Message Date
stickler-ci
9bfb7a5cbd Fixing style errors. 2021-02-05 12:08:05 +00:00
Gauthier PC portable 024
24b26b8980 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:49:23 +01:00
Gauthier PC portable 024
bed723aec0 FIX : getNomUrl() 2021-02-05 12:47:20 +01:00
Gauthier PC portable 024
d93c71a42f Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409 FIX : bank_url 2021-02-05 12:27:14 +01:00
Gauthier PC portable 024
8784e5d043 FIX : several merge errors 2021-02-05 11:12:55 +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
49470ea216 Trans 2021-02-05 00:56:44 +01:00
Laurent Destailleur
48be1f24d7 Reduce size required to store blockedlogs 2021-02-05 00:43:58 +01:00
Laurent Destailleur
59faccbc60 Load note_private 2021-02-05 00:34:15 +01:00
Laurent Destailleur
12454221ff Optimize output 2021-02-05 00:04:44 +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
865554bbde NEW Can filter on rowid in list of blocked logs. 2021-02-04 23:24:59 +01:00
Laurent Destailleur
d298f54abd Another memory optimization 2021-02-04 23:10:57 +01:00
Laurent Destailleur
42557a0148 Memory optimization in blockedlog module 2021-02-04 23:03:09 +01:00
Laurent Destailleur
98e5a655cc Fix message if not found 2021-02-04 22:20:57 +01:00
Laurent Destailleur
55e7bcb7ab Set max execution time 2021-02-04 22:14:46 +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
8cbd9fc0d8 CSS 2021-02-04 19:48:57 +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
Laurent Destailleur
95c75f8ba8 Fix css 2021-02-04 19:17:57 +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
f92dcf71ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-04 13:04:57 +01:00
Laurent Destailleur
b58b3a4932 FIX link to create event when task is in a project with a thirdparty 2021-02-04 13:03:05 +01:00
Laurent Destailleur
524b28d8c3 Fix missing tab info on holiday 2021-02-04 12:15:31 +01:00
Laurent Destailleur
284042af7a FIX User creation of expense report not visible 2021-02-04 12:05:28 +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
Laurent Destailleur
445e7a1e0c Clean code 2021-02-04 10:58:07 +01:00
Laurent Destailleur
4efdbc71e0 Fix phpcs 2021-02-04 10:46:58 +01:00
Laurent Destailleur
6e7e8d7d36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/CodingPhpTest.php
2021-02-03 23:26:08 +01:00
Laurent Destailleur
c3b409df31 Fix do not use CURDATE() 2021-02-03 23:18:44 +01:00
Laurent Destailleur
e89cc08ffa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-03 23:04:50 +01:00
Laurent Destailleur
91c594a66a Fix syntax error 2021-02-03 23:03:47 +01:00
Laurent Destailleur
d608a46c95 Fix dates 2021-02-03 22:47:35 +01:00
Laurent Destailleur
31e1e3e4df Fix cookie for remind the collapse status 2021-02-03 22:37:20 +01:00
Laurent Destailleur
ffb972fe5e Look 2021-02-03 22:21:11 +01:00
Laurent Destailleur
3e2b1370dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-03 21:02:46 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-02-03 20:46:22 +01:00
Laurent Destailleur
041decaf93 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:39 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +01:00
Laurent Destailleur
3c3294c07c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-03 20:42:58 +01:00
Laurent Destailleur
9ac2dc1a6e Fix phpcs 2021-02-03 20:42:30 +01:00