Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
e0201535e2
Fix: [ bug #1505 , #1504 ] Project trigger problem
2014-07-03 17:15:42 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Laurent Destailleur
1a9e53e21f
Fxi: Correct property name
2014-06-12 22:00:16 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +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
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Maxime Kohlhaas
0083e529c7
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
2014-03-16 14:31:02 +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
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Florian Henry
9555cb35f0
Add project clone option : copy project files, copy task files
2013-10-19 17:51:21 +02:00
Raphaël Doursenaud
7681c60f6b
Silly assignment was a bug
2013-09-05 17:22:51 +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
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Christophe Battarel
b8c51e3760
sort tasks by start date
2013-05-25 11:49:05 +02:00
Christophe Battarel
b89b7405f8
update function comments header
2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
2013-05-23 22:51:27 +02:00
fhenry
d0b4cef7a4
Change duration _planned by planned_workload
2013-05-14 20:22:33 +02:00
fhenry
760ae88f39
[ task #531 ] Add a duration on tasks
2013-05-13 17:08:36 +02:00
Regis Houssin
1be6a2c120
Fix: broken features for fileupload
2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e
Fix: broken features for fileupload
2013-04-22 14:37:18 +02:00
Raphaël Doursenaud
a564edbb87
Fixed private note update
2013-04-20 06:43:14 +02:00
fhenry
cc497490eb
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-12 11:09:53 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
d48f294531
New: [ task #289 ] Reorder tasks
2012-09-15 15:33:00 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
887f210618
Fix: avoid warning with php 5.4 and strict mode
2012-07-08 23:22:22 +02:00
Laurent Destailleur
792c0a33f3
Fix: Works with checkbox htdocs/core/class/html.form.class.php
2012-05-07 17:04:35 +02:00
Laurent Destailleur
6599f2d755
Checkstyle
2012-05-06 00:15:03 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
FHenry
4fd00c50be
Feature Clone project (357)
...
Fix variable date property name, to be compliant with varaible naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
2012-04-30 13:13:09 +02:00
FHenry
073e06ab8f
Feature Clone project (357) and other tricks
...
Fix variable date property name, to be compliant with variable naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
2012-04-27 11:03:01 +02:00
Laurent Destailleur
66531ea539
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/fourn/commande/index.php
2012-04-16 12:03:33 +02:00
Laurent Destailleur
9114fec4ed
Doxygen
2012-04-16 12:01:32 +02:00
Regis Houssin
a03b216c63
Fix: remove unnecessary function
2012-04-16 11:39:51 +02:00
Laurent Destailleur
b23bbc2432
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/projet/class/task.class.php
2012-04-15 18:49:09 +02:00
Regis Houssin
48543a0d2f
Fix: sorry it's ok
2012-04-15 18:33:14 +02:00
Laurent Destailleur
ef79c1ba21
Fix: commit at wrong place
2012-04-15 18:18:46 +02:00
Regis Houssin
057103902b
Fix: you can not delete project document folder in delete task method
2012-04-15 18:17:55 +02:00
FHenry
bf8389144a
correct bug 364
2012-04-15 17:51:05 +02:00
FHenry
d66eb5bb23
Corect bug #364
2012-04-15 17:50:50 +02:00
Laurent Destailleur
99d740fd2f
New: [ task #285 ] Add search filter on project in tasks list.
2012-03-19 14:44:27 +01:00
