Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
140,250 Commits 36 Branches 189 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

1161 Commits

Author SHA1 Message Date
Julien Nicolas
c666c2cb89 Bugfix project stats when user has no project 
In case of no project assigned to user, stats were using all projects
 2022-08-30 12:02:53 +02:00
lmarcouiller
6e31609b14 Fix #21810 : Broken statistics in project module 2022-08-30 11:31:20 +02:00
stickler-ci
e7242788b9 Fixing style errors. 2022-08-02 09:00:15 +00:00
Gauthier PC portable 024
da196b868c NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line 2022-08-02 10:49:34 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
da03175c07 Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Frédéric France
b46ede5eae fix deprecated in project 2022-06-22 13:50:54 +02:00
HENRY Florian
770abb73f6 Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
3481a4652a Merge pull request #21264 from fboitel/fboitel-dev-scrutinizer-009 
BUG FIX Attribute datee doesn't exist on class Task
 2022-06-17 14:50:11 +02:00
Faustin
aa2b96fb48 Added deprecated attribute datee in class Task 2022-06-15 14:10:21 +02:00
stickler-ci
73977f8a84 Fixing style errors. 2022-06-15 12:09:40 +00:00
Faustin
e5ec06ab53 Added deprecated attribute datee in class Task 2022-06-15 14:09:00 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
f247bda226 Attribute datee doesn't exist on class Task 2022-06-14 10:54:12 +02:00
BENKE Charlene
b176d1a59d not my best day 2022-06-09 23:17:29 +02:00
BENKE Charlene
4d327dcc18 datee and dateo not filled 
now we user date_end and date_start
 2022-06-08 17:00:04 +02:00
lmarcouiller
2a89e396fe Fix #20878 : improper use of dol_move 2022-06-01 15:17:19 +02:00
Laurent Destailleur
b43159db6d Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
Laurent Destailleur
4c10c04f9f Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
Laurent Destailleur
ac60aa4711 NEW Add filter "opportunity status" on statistics of projects. 2022-05-16 10:45:42 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
88a9b8c201 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-12 10:37:08 +02:00
kamel
aee6f408b2 FIX: Set datec when add time spent on a project task 2022-05-11 09:30:39 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Laurent Destailleur
d76e7224d9 NEW Can set the max number of attendees for an organized event 2022-05-04 01:53:45 +02:00
John BOTELLA
7d3030aa8e Fix fatal error for usage in tpl 2022-05-03 12:31:30 +02:00
Florian HENRY
c951e681c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-04-13 09:31:07 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
5108240ed5 Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility 
FIX multicompany sharings compatibility
 2022-03-29 13:56:43 +02:00
kamel
d43b180115 FIX - Move delete task time trigger position 2022-03-29 10:26:38 +02:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00
Florian HENRY
6774f0e571 new: entities is now updated on project update method 2022-03-25 11:53:27 +01:00
Florian HENRY
df5c427d0d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-04 08:41:04 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
BENKE Charlene
5f3c81daee FIX if we have PRODUCT_USE_UNITS, task fail 
we need 	public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
 2022-02-04 15:35:03 +01:00
Laurent Destailleur
3884c7b25f Merge pull request #19894 from defrance/patch-176 
FIX if we have PRODUCT_USE_UNITS, task fail
 2022-02-04 15:32:24 +01:00
stickler-ci
a8344d9059 Fixing style errors. 2022-01-28 22:03:08 +00:00
mschamp
a8dd73d007 FIX #19294 implement detailed timespent in task of project API 2022-01-28 22:59:32 +01:00
Laurent Destailleur
6783ec80be Try a change on a file to trigger travis 2022-01-26 14:17:32 +01:00