Laurent Destailleur
e984d7df9f
NEW Add total of time spent in timespent page at top of page too.
2018-02-09 23:52:43 +01:00
Laurent Destailleur
633dc507fe
NEW Use a css style for weekend in time spent
2018-02-09 20:11:32 +01:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
b0cecab22b
Removed useless code
2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b
Disable tab if not on develop mode
2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
e06087888b
NEW Show line "other filtered task" when using filter on timesheet.
2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff
Fix time spent counted twice
2017-11-16 19:41:31 +01:00
Laurent Destailleur
f5e1ca3178
Fix break on project
2017-11-02 15:33:04 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
f02e731c67
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/project.lib.php
2017-10-27 02:32:09 +02:00
Laurent Destailleur
fed0f3d09e
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/class/task.class.php
2017-10-27 02:30:33 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
gauthier
3793ae323a
FIX : wrong personnal project time spent
2017-10-19 09:46:19 +02:00
Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +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
9b3826a54c
Invert left and right (my own comment on left)
2017-10-04 13:17:16 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +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
2a04d497da
Use a different css into timespent entry page when user is on holiday
2017-09-19 16:40:55 +02:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +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
85d59b32b3
Add timespent entry into HR top menu too
...
Faster update of total of timespent
2017-09-18 13:15:24 +02:00
arnaud
fdd758abb4
FIX empty test on conf fortask comment was bad
2017-09-08 09:17:22 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
d8ead2693f
Fix field position
2017-08-24 17:59:20 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
5e17c2efb9
Fix into filters of time consumed
2017-07-28 23:32:55 +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
a36a9fab2f
Look and feel v6
2017-05-18 12:12:36 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +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
36c2b5afcd
Responsive
2016-10-24 18:43:17 +02:00
Laurent Destailleur
bc2342e9a4
Fix bad link
2016-10-24 17:37:39 +02:00
Laurent Destailleur
dada679110
Uniformise code
2016-10-18 12:16:12 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
699f857a5e
NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty
...
on page to submit time.
2016-07-20 18:02:33 +02:00
Laurent Destailleur
bfb48ecce9
Where is the info tab of project ?
2016-07-09 15:30:42 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
d8d938e82c
Fix performance problems Enter new time spent duration becoma < 1s
...
instead of 30s with 5000 tasks.
2016-07-08 17:06:12 +02:00
Laurent Destailleur
999341c1a2
Better performance
2016-07-08 12:02:09 +02:00
Laurent Destailleur
8356dd1080
Fix minor
2016-06-20 10:22:08 +02:00
Alexis Algoud
25fe110a34
FIX a task without project inclusion call a non included object Link
2016-06-16 14:08:14 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Maxime Kohlhaas
0ab4827091
FIX #5087
2016-06-05 02:06:32 +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
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +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
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
Laurent Destailleur
469a44a4cf
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:19:34 +01:00
Laurent Destailleur
dd6e60630d
Fix size of cells make page too large even for large screen
2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910
Fix size of cells make page too large even for large screen
2016-01-21 14:56:26 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
0f456c46ab
Clean project pages to work like other modules
2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
8c03e46a83
Removed a TODO
2015-12-04 18:33:57 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
Laurent Destailleur
e6ebc9c293
More complete tooltip help
2015-12-04 12:24:36 +01:00
Laurent Destailleur
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +01:00
Laurent Destailleur
c7447b0899
Add thirdparty of project into project summary of project home page.
...
Total use a different color
2015-11-21 20:25:28 +01:00
Laurent Destailleur
e3c6e4ebe5
NEW Add planned workload and declared progress on project summary list
...
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
Laurent Destailleur
c15c0f6fbb
Minor css fix
2015-11-21 15:31:27 +01:00
Laurent Destailleur
6482a4ee04
Minor css fix
2015-10-30 20:04:03 +01:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
6520ed7a08
Use css not bold title.
...
Add missing badge (count of draft records) on draft list.
2015-10-13 14:09:14 +02:00
Laurent Destailleur
6ea05aa311
FIX Bad translation key for project "Overview"
2015-10-06 16:03:47 +02:00
Laurent Destailleur
d92604f646
FIX Link of project must be cickable if user has permission to read all
...
projects
FIX Missing information into the alt of project picto
2015-10-06 00:46:26 +02:00
philippe grand
61f6da0210
the form should be outside table to avoid errors
2015-08-15 16:07:59 +02:00
Laurent Destailleur
72e7558356
Fix bad closing td
...
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
2015-07-28 12:49:29 +02:00
Laurent Destailleur
a16d6b037c
Fix: bad link to task
2015-07-28 12:06:57 +02:00
Laurent Destailleur
8d77667764
Bad stat report
2015-07-10 10:42:42 +02:00
Laurent Destailleur
324d855b9c
Still working on project module to uniformize way of working with other
...
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06
NEW Add opportunity amount on project card.
2015-06-29 16:57:32 +02:00
Laurent Destailleur
a27212644e
NEW Can add project search on left menu search area
2015-06-22 11:55:21 +02:00
Laurent Destailleur
3678a12767
NEW Can assign a task to yourself to have it appear on timesheet
2015-06-11 18:27:59 +02:00
Laurent Destailleur
d109c78c6b
Fix label of project was not visible
2015-06-03 16:59:48 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
3ee2790737
Always sho project info when opening task card
2015-04-09 16:26:21 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Laurent Destailleur
b0b88be81f
Sync transifex
2015-03-18 15:27:27 +01:00
Laurent Destailleur
840b047468
Work on new timesheet input pages.
2015-03-18 11:20:08 +01:00
Laurent Destailleur
5d4d8151c1
Work on new timesheet input pages.
2015-03-18 11:04:50 +01:00
Laurent Destailleur
97f36825df
Work on new timesheet page
2015-03-05 21:47:50 +01:00
Laurent Destailleur
d7ab3f112c
NEW: Show difference between timespent by everybody and time spent by
...
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
2015-03-05 13:48:57 +01:00
Laurent Destailleur
c36f92396b
Add navigation into the new timesheet week page.
...
Fix bad merge
2015-03-05 11:13:44 +01:00
Laurent Destailleur
107a16ed75
Work on timesheet module
2015-03-04 00:53:35 +01:00
Laurent Destailleur
a0f8b39250
Prepare code for a perday week timesheet input of time spent.
2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e
Fix: we must use status to find label of status
2015-03-01 16:24:02 +01:00
Laurent Destailleur
51fff77355
Fix: time 0 must be different than time unknown.
2015-02-28 19:02:03 +01:00
Laurent Destailleur
ba5d355eb3
Fix bad property
2015-02-07 02:14:45 +01:00
Laurent Destailleur
3f042fb558
New: Introduce option PROJECT_HIDE_TASKS for people using project only
...
as transversal analytic key and not to manage tasks.
2015-02-02 13:27:55 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
76bd7dd512
Fixed: A lot of fixed on project views (info on project area). Also add
...
a limit to avoid problem with very large database.
2014-12-04 11:03:48 +01:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
2b479aa0b4
Qual: Uniformize translated label of progress on all pages.
...
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Raphaël Doursenaud
769d824e7b
Allow reporting progress along with timespent
2014-10-01 14:12:47 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Cubexed
c3b255bce9
Changed sql to be portable
2014-09-16 15:27:04 +02:00
Cubexed
71a1857b49
Ignore dateo/datee if is a null column
2014-09-12 16:46:19 +02:00
Cubexed
c23fab267c
This commit adds a way to filter projects by checking if
...
selected year is in creation/ending range.
The year input is shown after the list, outside the table.
It's hidden by default and must be
enabled with PROJECT_LIMIT_YEAR_RANGE
2014-09-12 05:30:17 +02:00
aspangaro
b25db97c28
Typo
2014-08-30 05:30:37 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/main.inc.php
2014-08-08 01:19:03 +02:00
Laurent Destailleur
48fc945648
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/activity/list.php
2014-08-07 12:13:00 +02:00
Laurent Destailleur
1016e05fc6
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
2014-08-07 11:50:34 +02:00
Laurent Destailleur
b7cb2e6b9d
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
2014-08-07 11:48:19 +02:00
Laurent Destailleur
92a5ebc459
- New: Home page of project area shows list of draft project (like other
...
main page).
- New: Can search on project ref or string from project main page (like
other main page).
2014-07-17 01:28:01 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
4e41b721fb
Fix: Nb of notes and doc not visible onto tasks.
2014-05-10 16:43:47 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
880f77b7e1
Fix: Preview feature
2014-04-30 13:50:25 +02:00
Raphaël Doursenaud
ca8cf9101c
Qual: Removed missing variable from function call
2014-04-23 18:24:01 +02:00
Laurent Destailleur
c2b7e40aa1
Merge pull request #1507 from GPCsolutions/3.5-taskswithtime
...
Project: make tasks accept a time
2014-03-27 15:56:26 +01:00
Raphaël Doursenaud
d9cb1da4d5
Project: make tasks accept a time
2014-03-24 15:26:36 +01:00
Laurent Destailleur
8cf3d258f4
Fix: Bug into calculation of total of time for tasks
2014-03-17 15:13:24 +01:00
Maxime Kohlhaas
4d48034ad1
Fix
2014-03-16 09:50:03 +01:00
Laurent Destailleur
241ae7a4d1
Fix: Miscellaneous bugs on tasks management
...
Conflicts:
htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
afca98323b
Fix: Miscellaneous bugs on tasks management
2014-03-11 20:38:29 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
Laurent Destailleur
7fd34e5ff6
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
2014-01-06 12:42:50 +01:00
Laurent Destailleur
922929fffb
Fix: Missing column
...
Fix: Line was not added correctly
Fix: Missing message
2013-11-05 11:17:54 +01:00
Laurent Destailleur
692aa66cad
Fix: Tons of bug with new field planned_workload
2013-10-30 21:44:04 +01:00
Laurent Destailleur
b3a0510407
Fix: Allow text input for hour.
2013-10-30 11:57:32 +01:00
Maxime Kohlhaas
da3e711be7
Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project
2013-07-20 10:54:38 +02:00
Florian Henry
0c0a64f532
[ task #924 ] Add numbering rule on task
...
[ task #925 ] Add ODT document generation for Tasks in project module
2013-07-18 10:24:45 +02:00
Laurent Destailleur
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00