Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +02:00
Laurent Destailleur
f93ecc1584
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/projet/activity/perweek.php
htdocs/projet/element.php
2017-10-10 11:24:17 +02:00
Laurent Destailleur
dce71d6e7d
Fix loose filter
2017-10-09 18:51:33 +02:00
Laurent Destailleur
9427655dd0
Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default
2017-10-09 18:18:34 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
Laurent Destailleur
1becbb8805
Fix bad date on time spent view
2017-10-06 14:38:33 +02:00
Laurent Destailleur
ef3d86333c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perday.php
2017-10-06 12:38:50 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
711bbe0afb
FIX #7546
2017-10-05 11:09:09 +02:00
Laurent Destailleur
5f7631a95d
NEW Days where user is on vacation use different colors in timesheet.
2017-09-19 17:07:39 +02:00
Laurent Destailleur
f4ddce7274
FIX View of timespent for another user
2017-09-19 17:05:50 +02:00
Laurent Destailleur
2a04d497da
Use a different css into timespent entry page when user is on holiday
2017-09-19 16:40:55 +02:00
Laurent Destailleur
da6b1e92b2
NEW Add the total in the perday view of the time spent form.
2017-09-18 14:18:34 +02:00
Laurent Destailleur
032f54dd1a
Fix search criteria lost during navigation
2017-09-06 15:36:16 +02:00
Laurent Destailleur
d8ead2693f
Fix field position
2017-08-24 17:59:20 +02:00
Laurent Destailleur
ecb4eebfac
Fix filter of project in timespent view
2017-07-31 06:58:55 +02:00
Laurent Destailleur
5e17c2efb9
Fix into filters of time consumed
2017-07-28 23:32:55 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
4dc7d5cd8d
Fix : tooltip on bank in customer invoice card
2017-05-14 21:20:35 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
Laurent Destailleur
0d6a99b35a
Fix space
2017-03-16 11:01:35 +01:00
Laurent Destailleur
ec7d48931e
Merge duplicate menus/page on projects
2017-03-14 13:49:04 +01:00
Laurent Destailleur
f16e65c6b1
Fix css
2017-01-30 12:22:58 +01:00
Laurent Destailleur
8ec1784e41
Better translation
2017-01-20 09:46:36 +01:00
Laurent Destailleur
209990fd15
Fix look and feel v5
2016-12-15 23:28:18 +01:00
Laurent Destailleur
bd0b017571
Missing filters
2016-12-06 12:13:03 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e9b78db1ac
Several bug fixes:
...
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
2016-11-19 02:16:12 +01:00
Laurent Destailleur
0f88bdd971
NEW Can filter on project ref on the "new time consumed" page.
2016-10-18 12:15:59 +02:00
Laurent Destailleur
891297d165
Fix alignement
2016-09-19 17:12:53 +02:00
Laurent Destailleur
03dbf6e747
Fix edit of progess only
2016-07-09 14:28:33 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
878ba07fcd
NEW The note on time spent can be entered when using the view per day.
2016-05-04 12:24:15 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Laurent Destailleur
08b3b0cf19
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-28 23:50:23 +01:00
Laurent Destailleur
c8d232e056
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/card.php
2016-01-28 12:18:25 +01:00
Laurent Destailleur
33355c613a
FIX When we make a direct assignement on a task to a user, we must check
...
he is also assigned to project (and if not assign it)
2016-01-26 17:50:57 +01:00
Laurent Destailleur
93903b7330
Task lit to assign when entering timesheet is on top. This is more
...
convenient and save spaces.
2016-01-25 16:01:50 +01:00
Laurent Destailleur
befe58ab98
Fix selection of first entry into select
2016-01-07 13:44:19 +01:00
philippe grand
c9d6607b04
[Qual] Uniformize code
2015-12-17 14:14:44 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
