Commit Graph

104352 Commits

Author SHA1 Message Date
Frédéric FRANCE
af8f74103a
Update knowledgerecord_list.php 2021-10-31 20:48:13 +01:00
Frédéric FRANCE
033d983f05
fix warning 2021-10-31 20:41:07 +01:00
Laurent Destailleur
cb648705ce
Merge pull request #19186 from ptibogxiv/patch-448
Fix excluded member display in takepos
2021-10-31 18:04:19 +01:00
Laurent Destailleur
5b4602fbd8
Merge pull request #19058 from FHenry/fix_php8
fix php8 warning
2021-10-31 18:02:14 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
ca53176b14
Merge pull request #19179 from frederic34/tasklist
fix warnings in task list
2021-10-31 17:52:31 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a
Merge pull request #19187 from frederic34/patch-8
fix warning
2021-10-31 17:51:16 +01:00
Laurent Destailleur
8f54143bfb
Merge pull request #19178 from frederic34/patch-1
fix not defined
2021-10-31 17:47:34 +01:00
Laurent Destailleur
1d1e75683d
Merge pull request #19183 from frederic34/patch-5
fix warning
2021-10-31 17:47:23 +01:00
Laurent Destailleur
216eb7bd5a
Merge pull request #19185 from frederic34/bankentrieslist
fix warnings in bankentries list
2021-10-31 17:47:14 +01:00
Laurent Destailleur
43b4a783a5
Merge pull request #19184 from frederic34/patch-7
fix search
2021-10-31 17:47:05 +01:00
Laurent Destailleur
e1047afb05
Merge pull request #19194 from atm-florianm/FIX_minor_remove_two_unused_js_lines
[minor] remove two unused js lines
2021-10-31 17:46:00 +01:00
Laurent Destailleur
c0bde3e271
Merge pull request #19200 from frederic34/patch-9
fix warning
2021-10-31 17:38:23 +01:00
Laurent Destailleur
d90253eb08
Merge pull request #19203 from frederic34/patch-12
fix rights and warnings
2021-10-31 17:38:02 +01:00
Laurent Destailleur
ae103f20ca
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
Fix introduced scrutinizer
2021-10-31 17:37:31 +01:00
Laurent Destailleur
df5b2b6728
Update viewcat.php 2021-10-31 17:36:56 +01:00
Laurent Destailleur
8ebbe32781
Merge pull request #19205 from frederic34/patch-13
fix warnings
2021-10-31 17:34:46 +01:00
Laurent Destailleur
aaa8efbddc
Merge pull request #19201 from frederic34/patch-10
fix warning
2021-10-31 17:34:25 +01:00
Laurent Destailleur
ef21b5ca78
Merge pull request #19206 from frederic34/patch-14
fix warning
2021-10-31 17:34:18 +01:00
Laurent Destailleur
b513d21bca
Merge pull request #19208 from Quentin-Seekness/patch-1
FIX: Can't create new attendee
2021-10-31 17:33:42 +01:00
Laurent Destailleur
efa8b7943e Merge 2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 17:20:09 +01:00
Laurent Destailleur
dbf330b49c Comment on test 2021-10-31 17:17:21 +01:00
Laurent Destailleur
05cdbcc092 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 17:12:13 +01:00
Laurent Destailleur
b966286895 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 17:12:04 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
ffc1d8fb97
Merge pull request #19211 from FHenry/14_fix_modulebuilder
fix: setup template on module builder (error SQL when not tag exists)
2021-10-31 17:09:15 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete
FIX restrictedArea for payment delete
2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php 2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c
Merge pull request #19212 from fr69400/develop
[minor] Fix some warning
2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51 FIX #19210 2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning
fix: warning dol_print_date setTimeStamp when time empty
2021-10-31 16:49:13 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4
remove duplicate code
2021-10-31 16:47:33 +01:00
Laurent Destailleur
ad6f7e1a48 Default target is same window for a link on app, external if not defined 2021-10-31 16:31:15 +01:00
Laurent Destailleur
82898b1aca Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 16:25:46 +01:00
Laurent Destailleur
9989180c5f Fix target is lost 2021-10-31 16:25:29 +01:00
Laurent Destailleur
1e7c5fff6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 16:19:37 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
15406f16d2
Merge pull request #19215 from FHenry/14_fix_catagorie_method
fix: getFilterSelectQuery get correct table
2021-10-31 16:13:36 +01:00
Laurent Destailleur
f19b58c81d
Merge pull request #19226 from andreubisquerra/develop
TakePOS hooks improvements
2021-10-31 16:13:11 +01:00
Laurent Destailleur
7310d87c23
Merge pull request #19232 from cfoellmann/fix-holiday-upload
Fix holiday upload
2021-10-31 16:11:25 +01:00
Laurent Destailleur
f989b145af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18 FIx #19227 2021-10-31 15:59:03 +01:00
Laurent Destailleur
707dd85f43
Merge pull request #19242 from aspangaro/14p25
FIX Accountancy - Product admin - Log error when we affect accounting account with product_perentity activated
2021-10-31 15:22:01 +01:00
Laurent Destailleur
41b8c92311
Update card.php 2021-10-31 15:16:40 +01:00
Laurent Destailleur
82e7c4b237
Merge pull request #19244 from hregis/fix_missing_access_right
FIX missing service access right
2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
8064ecce73 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 14:38:07 +01:00