Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
Laurent Destailleur
499d93b8c4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Philippe GRAND
30992f2730
Standardize and update code
2018-08-23 18:52:47 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
88d3bf0148
FIX creation of tasks must hide closed project
2018-06-21 18:47:02 +02:00
ATM-Nicolas
d875553648
FIX : Remove fetchComments from project and task fetch function
2018-05-22 16:03:03 +02:00
ATM-Nicolas
f46d514586
Merge branch '7.0' of github.com:Dolibarr/dolibarr into fix_comments_on_tasks
2018-05-22 15:12:24 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
2018-05-05 14:34:54 +02:00
florian HENRY
3657857d21
fix project and task visibility same as list
2018-05-02 19:29:18 +02:00
ATM-Nicolas
3d179fb7d3
FIX : Fetch function will fetch comments
2018-04-24 09:17:03 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
23a4a60970
Fix status of task
2018-03-06 21:51:43 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
c4eba665d0
Fix order of task in gantt diagram
2018-01-04 13:52:37 +01:00
Laurent Destailleur
2204790602
Fix filter on project id when id is list with comma
2017-12-18 19:04:57 +01:00
Laurent Destailleur
929893bd49
Fix regression introduced with task comments
2017-12-15 20:07:35 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
02ce9c5e62
Fix doxygen
2017-10-13 13:25:55 +02:00
Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +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
d07ec07896
FIX #7554
2017-10-06 15:22:40 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
322af9e2df
Fix travis
2017-09-14 08:25:04 +02:00
Laurent Destailleur
6370e2f514
Force type of object
2017-09-12 19:03:30 +02:00
Laurent Destailleur
47d2350ad4
Fix bugs reported by scrutinizer
2017-09-12 19:03:12 +02:00
arnaud
7f5950c958
FIX multiple comments not reset on fetch
2017-09-08 09:14:34 +02:00
arnaud
680fab313c
NEW preload comments in task
2017-09-07 16:47:52 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Laurent Destailleur
0805c693ae
Fix restore of last_search_value ko
2017-06-07 10:55:39 +02:00
Regis Houssin
a25facef7c
Fix: use 0 instead false
2017-06-03 11:49:59 +02:00
Regis Houssin
aa780ea33b
Fix: missing dot
2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
a36a9fab2f
Look and feel v6
2017-05-18 12:12:36 +02:00
Laurent Destailleur
0b52c43e05
Fix bad selection of progress when not known
2017-05-18 11:35:12 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
Laurent Destailleur
acb2c57f47
Merge pull request #6290 from marcosgdf/little-change-generatedoc
...
Uniformize code: Little improvement to generateDocument function
2017-01-18 16:38:39 +01:00
bgenere
c6bd1a7d7d
FIX issue on Task delete
...
Added a control on time spent so it is not possible to delete a task
where some time spent has already been tracked.
2017-01-18 10:57:18 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
064f38b89e
Fix condition to show time spent on project overview
2017-01-02 12:17:27 +01:00
Laurent Destailleur
bd0b017571
Missing filters
2016-12-06 12:13:03 +01:00
Scrutinizer Auto-Fixer
2a62564768
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-11-22 18:16:17 +00:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +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
9fd5ddf807
NEW Add REST API for projects
2016-11-09 22:54:51 +01:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
bc2342e9a4
Fix bad link
2016-10-24 17:37:39 +02:00
Sergio Sanchis Climent
4800918323
FIX: Documents no change directory if change reference of the task.
2016-10-18 23:17:45 +02:00
Laurent Destailleur
be917c34af
Uniformize code and look and feel
2016-10-17 18:18:06 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
Laurent Destailleur
8edb51a017
FIX Extra fields of task not copied on project cloning
2016-10-16 18:27:39 +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
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
298c55b3ed
Fix bad property set. Must set fk_task_parent not fk_parent.
2016-07-08 16:22:16 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Juanjo Menent
75eb718c01
Merge pull request #4922 from atm-alexis/NEW_multientity_for_project
...
FIX multicompany project access
2016-04-03 16:13:24 +02:00
root
b018500fd4
FIX multicompany project access
2016-03-31 14:44:18 +02: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
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +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
phf
824da6d2b0
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
2015-07-27 17:38:27 +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
27cc7ef2b3
Time spent
2015-06-23 10:13:08 +02:00
Laurent Destailleur
dd8a0b849a
NEW If module salaries is on, you can set a hourly value for tome
...
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Laurent Destailleur
94ff635cc2
NEW Add filter on user contact or user task into task list
2015-04-23 16:20:25 +02:00
Laurent Destailleur
4f3fe82e93
NEW Add filter on task ref and task label into list of tasks
2015-04-23 15:22:50 +02:00
Scrutinizer Auto-Fixer
918ed34364
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-07 00:45:30 +00:00
Laurent Destailleur
5d4d8151c1
Work on new timesheet input pages.
2015-03-18 11:04:50 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
97f36825df
Work on new timesheet page
2015-03-05 21:47:50 +01:00
Laurent Destailleur
22045603b7
Fix bad update of denormalized field
2015-03-05 13:51:29 +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
a0f8b39250
Prepare code for a perday week timesheet input of time spent.
2015-03-01 17:45:36 +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
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
Marcos García de La Fuente
61809ef6b5
- Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database
2015-01-15 13:22:58 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +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
Florian HENRY
bd8b393d8a
Fix [ bug #1740 ] Clone project make task date crazy
2014-12-05 21:25:43 +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
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
Laurent Destailleur
44e2cd2194
Prepare code to manage task_datehour with task_date.
2014-10-12 01:20:03 +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
Laurent Destailleur
6c3c1d3a0a
Merge pull request #1930 from GPCsolutions/reportprogress
...
Allow reporting progress along with timespent
2014-10-12 00:10:28 +02:00
Laurent Destailleur
de5005ca54
Fix: Avoid duplicate error message
...
Fix: pgsql syntax error
2014-10-08 15:35:39 +02:00
Laurent Destailleur
a853aed348
Fix: Some fields not visibles. Wrong value for calculated time.
2014-10-03 03:42:11 +02:00
Raphaël Doursenaud
769d824e7b
Allow reporting progress along with timespent
2014-10-01 14:12:47 +02:00
Regis Houssin
f1f4fc18e9
Fix: use "doc" instead "pdf" dir and uniformize code
2014-09-29 11:08:50 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
e71dc6bc32
Created a method generateDocument for several classes
...
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
96cb9fe6cb
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/theme/eldy/graph-color.php
2014-08-15 02:28:16 +02:00
Florian HENRY
329c0b2913
Fix: Missing include files.lib.php in some pages ti use
...
dol_delete_recursive
2014-08-13 12:42:55 +02:00
Laurent Destailleur
7cbee97f6e
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
2014-07-08 20:26:38 +02:00
Laurent Destailleur
0e78e631c1
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
2014-07-08 20:22:51 +02:00
Laurent Destailleur
0eabf26d27
Fix: Checkstyle
2014-07-08 01:15:59 +02:00
Laurent Destailleur
ad4babb154
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
htdocs/fichinter/fiche.php
2014-07-08 01:12:55 +02:00
Laurent Destailleur
36e6f9a9fc
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
2014-07-08 01:06:17 +02:00
BENKE Charles
4d9f78dc07
getlibstatut added
...
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
2014-07-06 15:06:34 +02:00
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
Laurent Destailleur
9eb92b17ec
New: Increase usability of module project.
2012-02-15 23:08:20 +01:00
Laurent Destailleur
b52fc32853
Fix: fix not initialized variables
2011-12-05 19:41:38 +01:00
Laurent Destailleur
be6286c4b8
Qual: More POO.
...
Qual: Doxygen
2011-09-20 17:19:46 +00:00
Laurent Destailleur
b2c2adf307
Qual: Removed errors
2011-09-20 16:20:22 +00:00
Regis Houssin
2c1b3722f2
Fix: replace sizeof() by count()
2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Regis Houssin
27300fe898
Fix: remove obsolete tags (in progress)
2011-08-27 16:15:06 +00:00
Laurent Destailleur
37ead2f97e
Fix: Avoid errors into rpm packages
2011-07-31 23:19:04 +00:00
Laurent Destailleur
37651e9ce8
Fix: Description of task was missing into objects
2011-06-25 10:55:11 +00:00
Regis Houssin
3b4ea76538
Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class
2011-02-24 18:11:12 +00:00
Laurent Destailleur
47288c77da
Fix: Maxi debug of project permissions
2010-09-18 13:38:43 +00:00
Regis Houssin
7e70aaa2f0
Works on migration management positioning lines
...
rang is not implemented in project task for the moment
2010-09-06 16:51:05 +00:00
Laurent Destailleur
1785f5fe0e
Fix: Postgresql compatibility
2010-08-14 02:08:49 +00:00
Laurent Destailleur
4cd49aecea
Fix: A lot of bugs in project permission
2010-05-30 20:44:47 +00:00
Laurent Destailleur
e7438320e3
Add resources in gantt
2010-05-23 22:07:24 +00:00
Laurent Destailleur
e18abef970
Add start and end date into return array that list tasks
2010-05-22 14:18:51 +00:00
Laurent Destailleur
0f7fba3f29
Fix: List to get project
2010-05-17 00:16:40 +00:00
Regis Houssin
a9eb2a9da9
Add a common function to delete the linked contact
2010-04-30 05:51:23 +00:00
Regis Houssin
ff0bbd1c43
Fix: move class to class directory
2010-04-30 05:48:16 +00:00