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
8b5dd4910f
Fix bad update of denormalized field
2015-03-05 13:02:37 +01:00
Laurent Destailleur
13d8f26247
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/class/project.class.php
2015-03-04 18:58:50 +01:00
Laurent Destailleur
cf3190a4ef
Bad error management
2015-03-04 18:56:57 +01:00
Laurent Destailleur
5335a6affa
NEW: Add close date and user for projects.
2015-03-04 16:28:29 +01:00
Laurent Destailleur
4c1d51bd39
phpcs
2015-03-04 02:28:16 +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
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Laurent Destailleur
25bb6a588f
Fix list of project must be restricted on opened status
2015-02-23 00:57:48 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
Laurent Destailleur
070accd1e0
Work on new module expense report
2015-02-21 12:57:17 +01:00
Laurent Destailleur
3ca31e34cb
New: Add field "budget" (amount) on projects.
2015-02-16 10:58:05 +01:00
Laurent Destailleur
82b3f4a102
Add field budget_amount on project.
2015-02-16 10:40:09 +01:00
Laurent Destailleur
2e0b2fb012
Work on expensereport module
2015-02-15 22:49:23 +01:00
Laurent Destailleur
7cc9a09f99
Fix bad order
2015-02-07 04:06:30 +01:00
Laurent Destailleur
7738478564
Fix bad order
2015-02-07 03:29:33 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
79ac620ab5
Fix label of status
2015-02-07 01:32:21 +01:00
Laurent Destailleur
b36e40ee4c
Fix feature to break by email
2015-02-02 21:12:43 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
8267cec5a3
Fix: select if field is null
2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac
Fix: select if field is null
2015-01-22 20:09:57 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Florian HENRY
c8db8f001b
fix travis
2015-01-18 12:06:05 +01:00
Florian HENRY
b407716175
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-18 11:57:32 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Marcos García de La Fuente
5ec38d89ff
Fixed [ bug #1763 ] Undefined variable $interface in Project:574
2014-12-25 22:59:57 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
ef5035b349
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/liste.php
2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
Laurent Destailleur
2245361a2e
Fixed: [ bug #1732 ] Tasks ressources and time consumption are not
...
deleted on project / task deletion
2014-12-14 15:09:30 +01:00
Laurent Destailleur
cd6c72b142
Fixed: Update of time consumed
2014-12-10 20:03:39 +01:00
Laurent Destailleur
0459477097
Fix: Miscellaneous fixes for multicompany
2014-12-06 14:41:56 +01:00
Florian HENRY
99f817b69a
- New: Add Option to not change date on cloning project
2014-12-05 21:40:55 +01:00
Florian HENRY
bd8b393d8a
Fix [ bug #1740 ] Clone project make task date crazy
2014-12-05 21:25:43 +01:00
Laurent Destailleur
05059da9e8
Fix: [ bug #1631 ] technical error in the display of associated objects
...
/ erreur technique à l'affichage des objets associés à un projet
2014-11-17 01:06:30 +01:00
Laurent Destailleur
dfc5a98dc1
Fix: [ bug #1631 ] technical error in the display of associated objects
...
/ erreur technique à l'affichage des objets associés à un projet
2014-11-17 01:05:30 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Alexis Algoud
d177a2fbb4
fix bug on thm
2014-11-04 16:13:51 +01:00
Laurent Destailleur
a0c9af2385
New: Can filter on date into tab "Referring object" of a project.
2014-10-29 20:21:24 +01:00
Laurent Destailleur
3243958a70
New: getNomUrl can point to different page for tasks
2014-10-29 18:01:51 +01:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
