Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
3a2f44adac
Fix security permissions to edit/delete time spent
2017-01-13 14:24:39 +01:00
Laurent Destailleur
f185a09693
FIX Security access problem with external users on projects/tasks
2017-01-12 15:26:00 +01:00
tarrsalah
eb62c1eb0d
fix undefined method getProjectsAuthorizedForUser.
...
When a user don't have the permission
`$user->rights->projet->all->lire`, viewing some tasks related entities
(like `tasks/contact.php?id=1&withproject=1`) cause `Call to undefined
method Task::getProjectsAuthorizedForUser()` fatal error.
The problem is caused by calling getProjectsAuthorizedForUser on $object
insted of $projectstatic.
2017-01-04 16:35:04 +01:00
Laurent Destailleur
5c6ecf9aeb
Complete work on new list v5
2016-12-16 01:12:24 +01:00
Laurent Destailleur
209990fd15
Fix look and feel v5
2016-12-15 23:28:18 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
7fa9692458
Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.
2016-11-02 12:48:50 +01: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
36c2b5afcd
Responsive
2016-10-24 18:43:17 +02:00
Laurent Destailleur
6bd219b117
Fix column task ref/label
2016-10-24 17:47:31 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27: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
dada679110
Uniformise code
2016-10-18 12:16:12 +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
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
8755fa07af
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/main.inc.php
2016-10-11 12:35:14 +02:00
Laurent Destailleur
3eb8a667bc
Fix clean of search criteria
2016-10-11 12:34:21 +02:00
Laurent Destailleur
b91b8c64b5
Fix sql error if we use separator extra field
2016-10-11 12:27:20 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
538274998b
FIX #5770 Dolibarr doesn't modify correctly the hour of a task
2016-10-01 14:09:41 +02:00
Laurent Destailleur
10e9f4372b
NEW Show total line (planned workload and time spent) on on list of
...
tasks.
2016-09-19 16:42:45 +02:00
Laurent Destailleur
8352f64474
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/time.php
2016-08-31 01:04:33 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
c2b503d90f
Fix missing filter
2016-08-31 00:15:09 +02:00
Laurent Destailleur
1be3c86b4b
NEW Use new archi to select field into list of time spent
2016-08-30 20:17:34 +02:00
Laurent Destailleur
42293089a0
Fix several fix into tab management of tasks
2016-08-30 20:16:58 +02:00
Laurent Destailleur
2e372ced1e
Fix missing fields
2016-07-11 10:28:57 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
de157d9099
Fix quick search on tasks
2016-07-03 20:15:26 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Maxime Kohlhaas
c73c1a577a
Time spent can be saved with project read right
2016-06-30 14:24:03 +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
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
fb13225173
Fix links on list from warnings dashboard
2016-06-06 16:31:50 +02:00
Laurent Destailleur
473ab18306
Fix link on workboard
...
Fix warning picto is missing on task list
2016-06-06 15:48:41 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
2016-06-04 00:58:16 +02:00
Maxime Kohlhaas
c9c7045a6f
Fix access to project task time spent creation #5249
2016-06-03 23:34:37 +02:00
Laurent Destailleur
f901453a6b
FIX addMoreActionsButtons hook must be inside the div class=tabaction.
2016-05-05 21:38:29 +02:00
BENKE Charlie
379a621b1f
soory it's a mistake
2016-04-30 01:01:32 +02:00
BENKE Charlie
8a63298102
Missing addMoreActionsButtons hook
2016-04-27 22:19:38 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5
FIX Filter/search on extrafields on lists
2016-04-04 16:02:29 +02:00
Laurent Destailleur
f36f33f71b
Merge pull request #4915 from defrance/patch-117
...
Add contact hook on specific task contact page
2016-04-04 00:21:57 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
BENKE Charlie
98ef179307
Add contact hook
...
I use the same hook name as contactpl
2016-03-30 21:09:27 +02:00
Laurent Destailleur
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
Laurent Destailleur
423120db17
Merge pull request #4876 from atm-alexis/NEW_multientity_for_project
...
# New # multientity for project
2016-03-25 18:01:45 +01: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
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40 .
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Alexis Algoud
c3bdc6372d
NEW allow project to be shared across entities
2016-03-22 16:48:51 +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
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
Laurent Destailleur
e67be201ed
NEW Can select number of lines on page list for projects and tasks
2016-02-11 16:49:13 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +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
25924f31ad
Bad translation
2016-01-26 17:57:57 +01:00
Laurent Destailleur
b5c047d9a5
Fix link on project ref on task list must jump to tab task
2016-01-21 15:15:26 +01:00
Laurent Destailleur
39aede4071
Fix bad list of project/tasks
2016-01-21 15:09:46 +01:00
Laurent Destailleur
17ceca3758
Fix: no create button on list
2016-01-18 16:44:04 +01:00
philippe grand
c9d6607b04
[Qual] Uniformize code
2015-12-17 14:14:44 +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
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
Laurent Destailleur
3ce147ccc1
Use new architecture for quick search for the account area.
2015-10-17 02:41:09 +02: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
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
e776f685ba
FIX when editing time spent, date of line suggested was a rubbish value
2015-10-06 16:09:24 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
cf3eb1e452
Fix limit of nb of project.
2015-08-31 17:01:32 +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
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +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
67a9fa529f
Merge pull request #2241 from defrance69/patch-44
...
Update task.php
2015-06-05 15:45:50 +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
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +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
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +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
Laurent Destailleur
c97c5e0cfd
Fix selection of user was lost
2015-04-23 13:54:49 +02:00
Laurent Destailleur
f9285d6d23
NEW Can add all user of a project as user of a task, in one step.
2015-04-23 13:44:45 +02:00
jfefe
57d04c601f
Add title picto for project section
2015-04-18 23:39:04 +02:00
Laurent Destailleur
5d4d8151c1
Work on new timesheet input pages.
2015-03-18 11:04:50 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Laurent Destailleur
605a7dee0e
Fix: Deleting task do not return to correct page
2015-03-14 11:56:28 +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
51fff77355
Fix: time 0 must be different than time unknown.
2015-02-28 19:02:03 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
BENKE Charles
d98d4d219f
Update task.php
...
use GETPOST instead of $_GET and $_POST
2015-01-19 22:46:28 +01:00
BENKE Charles
c923d06d84
Update task.php
2015-01-15 17:10:47 +01:00
BENKE Charles
a33727f4c5
Update task.php
...
Allow to change the ref of a task (like the ref of project)
2015-01-15 13:00:11 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Laurent Destailleur
ade688b589
Merge pull request #2174 from marcosgdf/bug-1723
...
Fix [ bug #1723 ] Draft tasks?
2014-12-26 03:48:15 +01:00
Marcos García de La Fuente
78307a748d
Corrected confusing table header in task list
2014-12-23 15:56:29 +01:00
Marcos García de La Fuente
db30186386
Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
2014-12-22 22:52:43 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
ec9c3cc115
Fix: Better translation
2014-12-04 11:53:44 +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
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
Laurent Destailleur
60e5369db2
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/bookmarks/card.php
2014-11-27 22:01:02 +01:00
aspangaro
ef991e6c5d
HTML5 - <center> is deprecated - Need CSS - continue working
2014-11-24 06:43:15 +01:00
Laurent Destailleur
891e39189a
Fixed: missing css class
2014-11-23 23:31:35 +01:00
aspangaro
bbdd25f97c
Add function purge criteria in project module
2014-11-23 21:37:45 +01:00
Laurent Destailleur
068c7fdb2d
Fixed: [ bug #1635 ] le tiers n'apparait plus sur la fiche tache
2014-11-22 00:31:19 +01:00
Laurent Destailleur
d462facf6d
Fixed: [ bug #1653 ] Can't access task notes
2014-11-20 14:44:49 +01:00
Laurent Destailleur
4b34455f0a
Fix permissions
2014-10-17 15:01:56 +02: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
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
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +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
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
ca9e33e809
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf
2014-09-21 18:00:56 +02:00
Florian HENRY
119be5da42
Better ressource management on project and task
2014-09-20 10:14:26 +02:00
Laurent Destailleur
9666d5e3ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/langs/en_US/errors.lang
htdocs/product/class/product.class.php
2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036
Fix: Bad calculation of total
...
Fix: Warning message not translated
2014-09-18 10:05:37 +02:00
Marcos García de La Fuente
9dbf054026
Removed deprecated usage of project_pdf_create
2014-09-16 20:53:43 +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
4eeb92d082
Fix: Bad help text
...
Fix: Removed duplicate header
2014-08-08 02:11:03 +02:00
Laurent Destailleur
d0c3a7913f
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
2014-08-07 12:15:18 +02:00
Laurent Destailleur
1e473839e7
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
2014-08-07 12:06:16 +02:00
Laurent Destailleur
9bc2957257
Fix: visible task into area "time" for "My task" must limit task to
...
tasks i am assigned to.
2014-08-07 12:05:42 +02:00
Maxime Kohlhaas
108cf11c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-24 09:01:54 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +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
KreizIT
e0201535e2
Fix: [ bug #1505 , #1504 ] Project trigger problem
2014-07-03 17:15:42 +02:00
Maxime Kohlhaas
b301c54b7e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-03 08:28:00 +02:00
BENKE Charles
96876992d4
navigate (next/prev) error on task of project
...
use the same showrefnav function setting present in task.php file (who
work fine)
2014-07-02 04:27:18 +02:00
BENKE Charles
7dca46df57
navigate (next/prev) error on task of a project
2014-07-02 04:24:26 +02:00
Maxime Kohlhaas
3269b463bb
Fix / New : return on project page after task deletion instead of task list
2014-06-24 15:02:09 +02:00
Laurent Destailleur
f0ce92292a
Fix: date start/end of project was lost on some tabs.
...
Fix: Bad file name for gantt include.
2014-06-14 14:20:58 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
d41f87acab
Fix: Option to limit was not used everywhere.
2014-05-26 01:27:22 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
3fd7e18c08
Fix: Bad translation into title of action buttons
2014-05-10 17:00:55 +02:00
Laurent Destailleur
4e41b721fb
Fix: Nb of notes and doc not visible onto tasks.
2014-05-10 16:43:47 +02:00
Laurent Destailleur
62537cf5a4
Fix: translation
2014-05-09 13:39:10 +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
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8
Fix: [ bug #1354 ] Tasks disapear in same sub-task
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/projet/class/project.class.php
2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f
Fix: [ bug #1354 ] Tasks disapear in same sub-task
2014-04-26 21:36:58 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
6f40825270
Merge pull request #1527 from grandoc/3.5
...
translation and cleaning
2014-04-09 00:31:57 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Grand Philippe
fe49f55a48
fix from forum
2014-04-07 11:01:11 +02:00
Laurent Destailleur
da0aebb2e9
Fix: Can't add user
2014-04-05 12:40:24 +02:00
Laurent Destailleur
c7c640f925
Fix: Can't add user
2014-04-05 12:38:59 +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
Florian Henry
f93df7f3da
remove debug string
2014-03-26 10:09:29 +01:00
Florian Henry
3d12979b3f
remove debug string
2014-03-26 09:53:48 +01:00
Raphaël Doursenaud
d9cb1da4d5
Project: make tasks accept a time
2014-03-24 15:26:36 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
8cf3d258f4
Fix: Bug into calculation of total of time for tasks
2014-03-17 15:13:24 +01:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
561a1a1aac
Fix: Miscellaneous problems on task tabs (withproject parameter lost and
...
download fails).
2014-03-14 02:07:54 +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
6860ae84b9
Avoid browser to hang by adding PROJECT_MAX_NB_TASKS.
2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +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
97677f08a9
Fix: Add protection to avoid memory hung
2014-03-10 01:49:44 +01:00
Laurent Destailleur
b4977cd542
Fix: Bad permission var
2014-02-12 12:52:31 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335
Fix: Missing vars and bar id.
2014-02-04 20:41:23 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
b61ccb8234
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:15:07 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +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
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
039bd5b4c8
checkstyle
2013-11-06 10:20:11 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
692aa66cad
Fix: Tons of bug with new field planned_workload
2013-10-30 21:44:04 +01:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +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
Florian Henry
2476e7bcaf
Start functionnality
2013-07-17 18:45:58 +02:00