Commit Graph

9579 Commits

Author SHA1 Message Date
Frédéric FRANCE
b277ab9ee3 Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966 Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b Merge pull request #20074 from altairisfr/fix_parentline_13.0
More generic management of parentline
2022-02-16 20:25:04 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +01:00
Frédéric FRANCE
eb77f10d7b Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
a6a1e3886a Update propal.class.php 2022-02-15 11:03:50 +01:00
Frédéric FRANCE
b2815c4973 add hook in propal tooltip 2022-02-15 10:53:33 +01:00
Christophe Battarel
288c58e533 fix parent line on propal 2022-02-15 10:41:21 +01:00
Laurent Destailleur
271e9da425 Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event 2022-02-11 15:15:50 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c FIX events on several days may missing the last day in calendar view.
FIX the drag and drop was not available on some events
2022-02-11 11:27:50 +01:00
Laurent Destailleur
30d7f807e4 Fix url 2022-02-10 21:03:10 +01:00
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
d167e022eb Debug v15 2022-01-31 12:08:51 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Laurent Destailleur
eb336c81a1 Merge pull request #19926 from aspangaro/16a9
NEW API Proposals - Add POST lines
2022-01-26 12:06:33 +01:00
Alexandre SPANGARO
31787a99f0 NEW Proposal - Add filter on proposal get lines 2022-01-26 08:50:57 +01:00
stickler-ci
71876755d2 Fixing style errors. 2022-01-26 06:35:26 +00:00
Alexandre SPANGARO
68ba60896f Copyright 2022-01-26 07:31:17 +01:00
Alexandre SPANGARO
30fd55addc NEW API Proposals - Add POST lines 2022-01-26 07:29:37 +01:00
Laurent Destailleur
d06f570c23 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 16:50:11 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
1087ddb22f Clean code 2022-01-18 14:00:38 +01:00
Laurent Destailleur
ebc3ef2f37 Removed no more used property 2022-01-18 13:52:09 +01:00
Laurent Destailleur
fb6e5f03f9 Clean code and translation 2022-01-18 13:44:52 +01:00
Laurent Destailleur
e19994c756 Fix drag event on week view 2022-01-18 00:07:45 +01:00
Laurent Destailleur
254ed31fb1 Fix combo 2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149 Clean code 2022-01-17 22:52:56 +01:00
Laurent Destailleur
0e44bfd4e4 Fix remove $_GET 2022-01-17 18:53:57 +01:00
Laurent Destailleur
9d067d74ab Fix responsive 2022-01-17 17:51:03 +01:00
Laurent Destailleur
6826b373fd css 2022-01-16 13:22:21 +01:00
Laurent Destailleur
f51554fd4d Fix missing token 2022-01-13 20:40:42 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66 Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4 Update card.php 2022-01-11 13:31:16 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
37daf7764d Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning
FIX : late warning calculation on action comm list
2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480 Fixing style errors. 2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a FIX : late warning calculation on action comm list 2022-01-06 11:21:46 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00