Commit Graph

2024 Commits

Author SHA1 Message Date
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
f6f66f2a77 Fix syntax error 2019-06-17 18:11:38 +02:00
Laurent Destailleur
c0a30d1ff5 FIX #11325 FIX #5249
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-16 22:21:38 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Laurent Destailleur
899f41d68c Fix bad constant MAIN_MAIL_AUTOCOPY into email form of project page. 2019-04-29 18:26:27 +02:00
Laurent Destailleur
143cbec281 Fix test 2019-04-26 13:23:33 +02:00
Laurent Destailleur
f4efc86dd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-08 14:05:14 +02:00
Laurent Destailleur
ffca289bff Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-08 14:04:42 +02:00
Laurent Destailleur
c1f0826005
Update perweek.php 2019-04-08 13:49:16 +02:00
Laurent Destailleur
153e563c9f
Update perday.php 2019-04-08 13:49:05 +02:00
Laurent Destailleur
b23f74eab1 FIX Status of opportunity should never be -1 2019-04-08 12:17:57 +02:00
atm-ph
ea87b2ddb6 Fix no init hook on timesheet 2019-04-05 11:26:11 +02:00
Laurent Destailleur
fa95f5575c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/list.php
2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
29fe65ed75 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-26 12:37:21 +01:00
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
227f5f8f92 Code is cleaner 2019-03-18 09:08:53 +01:00
Alexandre SPANGARO
350f77db2b FIX: Error with various & salary payment on project 2019-03-17 23:00:13 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
atm-ph
2da60fb885 Fix var name 2019-03-15 15:15:03 +01:00
Laurent Destailleur
d88fc8cf91 Fix bad link 2019-03-07 17:32:10 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Laurent Destailleur
5c825310a3 Fix bad link and css 2019-01-19 14:49:44 +01:00
Laurent Destailleur
e0d11edb6b FIX Sql error on filter of project preview with date 2019-01-13 14:09:40 +01:00
ldestailleur
2c474de61e FIX Update of timespent when date is empty 2019-01-04 15:44:39 +01:00
Laurent Destailleur
d9b8a8c8ae Debug cash fence feature 2018-12-19 16:12:55 +01:00
Laurent Destailleur
f3a67d6c3f FIX Show warning when trying to create task on closed project 2018-12-10 15:06:54 +01:00
Laurent Destailleur
188cda7902 Fix look and feel v9 2018-12-10 12:32:26 +01:00
Laurent Destailleur
d3a6b16021 FIX Show declared progress 2018-12-07 14:54:09 +01:00
Laurent Destailleur
572366c6c2 FIX status of user 2018-12-07 14:54:02 +01:00
Philippe GRAND
8722ccef82 fix typo error 2018-11-26 14:35:29 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Laurent Destailleur
7d5c9959bc Close #9978
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Laurent Destailleur
103dfe2aa7 FIX go back to create form if error 2018-11-15 17:55:27 +01:00