Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

985 Commits

Author SHA1 Message Date
Laurent Destailleur
2fe9e24961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-06-16 00:56:43 +02:00
Laurent Destailleur
0d46edd121 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-06-16 00:45:37 +02:00
Maxime Kohlhaas
c7304271fa Fix #23806 use dictionary position to display contact type list 2023-06-11 00:42:29 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +02:00
Noé Courtier
07bec30c32 FIX: Task events not displayed 2023-05-11 11:10:33 +02:00
Gauthier PC portable 024
bb350d062b FIX : deletion of a line of time spent (backport e3aa438d2a) 2023-04-26 10:25:08 +02:00
Regis Houssin
7a12ba9c20 FIX missing "multidir_output" for project sharing (Multicompany) 2023-03-24 16:07:34 +01:00
Laurent Destailleur
a892ef56ab
Merge pull request #23422 from Dolibarr/fix_fatal_error_on_task_list_time_to_bill 
FIX #23420 : wrong check on $search_categ value causing FATAL ERROR
 2023-01-05 14:47:43 +01:00
Théo David
665fd9cc0e FIX : wrong check on $search_categ value causing fatal error 2023-01-05 10:46:08 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
Sébastien Prud'homme
ed89005941 Fix #23019 Impossible to add task times to an existing draft invoice 2022-12-14 11:45:40 +01:00
Milen Karaganski
811e24fd7c Change to define unit price from timespent data instead from the user hourly rate 2022-12-10 21:15:00 +02:00
Milen Karaganski
ee7e394ebf FIX|Fix [#23075] 
Wrong invoice unit price when billing Project task spent time
 2022-12-08 20:22:41 +02:00
ksar
95ce5c19dd
FIX #22482 
Preserve \r\n strings in task notes
 2022-10-06 14:36:53 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +02:00
Atm-Gregr
7d4c7e0f6b stickler 2022-09-13 14:28:57 +02:00
Atm-Gregr
4f9c273c64 retours 2022-09-13 14:19:28 +02:00
Atm-Gregr
527cfadf0f nl2br like on the card 2022-09-12 16:31:00 +02:00
Atm-Gregr
3c5f3f7b85 fix 2022-09-12 16:28:06 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 2022-07-22 17:43:35 +02:00
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
e991c614d3 Debug v16 2022-06-14 14:48:15 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
2ad7c0df74
Merge pull request #21178 from Quatadah/fix19860 
FIX  #19860
 2022-06-09 12:51:19 +02:00
stickler-ci
fb86cea3fc Fixing style errors. 2022-06-09 10:09:49 +00:00
NASDAMI Quatadah
8a48cd5989 Fixing bug 2022-06-09 12:05:23 +02:00
Laurent Destailleur
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
 2022-06-01 16:04:11 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00