Commit Graph

102535 Commits

Author SHA1 Message Date
Laurent Destailleur
d42492c67b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
2021-09-09 04:41:39 +02:00
Laurent Destailleur
ca2aa6d031 Clean comment 2021-09-09 04:37:08 +02:00
Laurent Destailleur
e20e80fae3
Merge pull request #18646 from ksar-ksar/patch-8
FIX #18591 : Remove double quotes of SQL Queries
2021-09-09 04:36:48 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token
FIX : Add token to remove error when removing widget
2021-09-09 04:31:03 +02:00
Laurent Destailleur
5de3d7d5d2 Clean var not initialized 2021-09-09 03:49:07 +02:00
Laurent Destailleur
7533092f27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-09-09 03:42:12 +02:00
Laurent Destailleur
88cd9afe84
Merge pull request #18643 from Gecka-Apps/14-takepos-fast-product-search
TakePos - fast product search
2021-09-09 03:37:52 +02:00
Laurent Destailleur
66a7992441 Fix var init 2021-09-09 03:34:51 +02:00
Laurent Destailleur
e4a7903700
Merge pull request #18657 from moreauftheobald/14.0_fiix_knowledgemanagement_menu
Fix: Enable Knowledge Management Menu
2021-09-09 03:23:26 +02:00
Laurent Destailleur
61d5152209
Update eldy.lib.php 2021-09-09 03:23:04 +02:00
Laurent Destailleur
8b58de50d5 Clean code 2021-09-09 03:21:41 +02:00
Laurent Destailleur
722cc5f3f9
Merge pull request #18647 from Hystepik/develop#4
Fix fatal error with php 8.0 holiday creation
2021-09-09 03:06:54 +02:00
Laurent Destailleur
0146153792
Merge pull request #18650 from aspangaro/14p18
css
2021-09-09 03:02:54 +02:00
Laurent Destailleur
348fe00ffb
Merge pull request #18653 from Hystepik/develop_v14#2
Fix permission for salaries module
2021-09-09 03:02:34 +02:00
Laurent Destailleur
b87ac639fd
Update card.php 2021-09-09 03:02:18 +02:00
Laurent Destailleur
4db234e036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 02:29:10 +02:00
Laurent Destailleur
ad9bf27bea Clean code 2021-09-09 02:26:49 +02:00
Laurent Destailleur
89ed156d7e Complete getOutstandingBills() 2021-09-09 02:18:50 +02:00
Laurent Destailleur
39dd1e2dd1 Code comment 2021-09-09 02:00:07 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Laurent Destailleur
8326ecee78 Fix phpcs 2021-09-08 21:19:40 +02:00
Laurent Destailleur
e0fa4e4b5c Fix phpcs 2021-09-08 21:19:01 +02:00
Laurent Destailleur
bfa75e91e2 Code comment 2021-09-08 20:59:56 +02:00
MOREAU FRANCK
04026dd0b0 fix Stickler CI review 2021-09-08 19:51:34 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
MOREAU FRANCK
e9505c1109 Update V14 2021-09-08 18:23:44 +02:00
lmarcouiller
a5e670291e Fix permission for salaries module 2021-09-08 15:36:51 +02:00
Regis Houssin
8c95ada9fd FIX wrong users count in multicompany transverse mode 2021-09-08 10:25:27 +02:00
Alexandre SPANGARO
6c118b4dfb css 2021-09-08 04:31:38 +02:00
Laurent Destailleur
0b68da4e9e Debug organizedeventregistration module 2021-09-08 02:27:52 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
1fda7d43ef Fix sql 2021-09-07 17:45:22 +02:00
Laurent Destailleur
83ec43a2ee css 2021-09-07 17:44:57 +02:00
Laurent Destailleur
0edf2f344b Fix sql 2021-09-07 17:38:46 +02:00
Laurent Destailleur
f2df3aa151 css 2021-09-07 17:27:29 +02:00
Laurent Destailleur
4e0ae972f1 Fix css 2021-09-07 17:26:31 +02:00
stickler-ci
e94c560e82 Fixing style errors. 2021-09-07 14:55:49 +00:00
Gauthier PC portable 024
938092d67c NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted 2021-09-07 16:46:48 +02:00
lmarcouiller
a10adcabcb Fix fatal error with php 8.0 holiday creation 2021-09-07 16:45:52 +02:00