Commit Graph

112767 Commits

Author SHA1 Message Date
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
Erik van Berkum
e7280feb0d
Merge branch 'Dolibarr:develop' into develop 2021-09-08 11:24:03 +09: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
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
2021-09-07 15:22:02 +02:00
Laurent Dinclaux
5ee51f965e Fixes coding standard 2021-09-08 00:12:55 +11:00
Laurent Dinclaux
303313b168 Takepos: set proper image directly when searching products
Bypasses genimg/index.php that either redirects to viewimage.php or to nophoto.png. That was making lots of request to the server and excessive load on the database server, that queues them slowing down the UI.
2021-09-08 00:02:27 +11:00
Laurent Destailleur
c3825e2394 css 2021-09-07 14:52:19 +02:00
Laurent Dinclaux
10780a343e TakePos: add temporization when searching products.
Adds a temporization after each typed letter, giving the user 700ms to type next letter before sending the search request
It prevents hammering the server for each typed letter and "results jumping" effect, which is error-prone.
2021-09-07 23:48:30 +11:00
Adrien Raze
5f58eefc79 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into FIX_add_token 2021-09-07 14:48:23 +02:00
Adrien Raze
948d2bc4e9 FIX : Add token when remove the last widget on home page 2021-09-07 14:43:37 +02:00
Laurent Dinclaux
c8af143468 Fix coding standards 2021-09-07 23:27:31 +11:00
Laurent Destailleur
586e5c8b5b Can set sort order in the ->fields description array for foreign key 2021-09-07 14:10:26 +02:00
lmarcouiller
f3babd2819 Fix #18633 : fix error message 2021-09-07 13:59:36 +02:00
Laurent Dinclaux
807b4bf93e Fix cash payment in some cases. Make pay requests language independant and rely on payment method code. 2021-09-07 22:42:17 +11:00
Laurent Dinclaux
a39f469a50 Only check takepos configuration if a terminal is choosen, to prevent error message 2021-09-07 22:31:09 +11:00
Laurent Destailleur
4380c75c61 Show ref into bomco box and label 2021-09-07 13:09:12 +02:00
Laurent Destailleur
4cbe83fbc8 Add ref in combobox 2021-09-07 13:08:37 +02:00
Laurent Destailleur
7b43d07a36 Fix sql 2021-09-07 13:01:18 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00