Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 05:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

2003 Commits

Author SHA1 Message Date
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99 FIX project overview (can use any fields as fk_projet) 2018-07-26 15:05:32 +02:00
Laurent Destailleur
9d1b7e25f7 Merge pull request #9127 from IAS-SYSTEMS-CSC/develop 
Fix if time spent minutes was zero
 2018-07-24 17:35:33 +02:00
ias-ceo
84bfe2965b if time spent minutes zero 2018-07-20 16:16:27 +03:00
Philippe GRAND
010c5af245 Clean and update code 2018-07-19 16:48:20 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
5138a09db3 Fix sql of time spent per day 2018-07-02 15:54:21 +02:00
gauthier
d8ca9f2947 FIX : we must see number of all shared projects 2018-06-27 17:26:04 +02:00
gauthier
86a58def3b FIX : getEntity project and not projet 2018-06-27 17:13:50 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
88d3bf0148 FIX creation of tasks must hide closed project 2018-06-21 18:47:02 +02:00
Laurent Destailleur
07c514b85c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/projet/class/projectstats.class.php
 2018-06-20 21:56:10 +02:00
Laurent Destailleur
828a9296b4 Fix stats on project 2018-06-20 21:52:06 +02:00
Laurent Destailleur
714057d435 Fix stats on project. Must use assignement on project as filter. 2018-06-20 21:31:37 +02:00
Laurent Destailleur
90b2314d98 Code comment 2018-06-20 21:24:57 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
5021c7a556 clean and update code 2018-06-10 18:29:04 +02:00
Laurent Destailleur
95d5a1088b Fix error on sql error (field does not exists) 2018-06-08 16:49:14 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Frédéric FRANCE
622c394283 loadlangs 2018-05-26 21:11:25 +02:00
Laurent Destailleur
3d97fa36d1 CSS 2018-05-25 11:08:05 +02:00
Laurent Destailleur
8303dc1e6f Merge pull request #8815 from atm-florian/develop_fixproject 
NEW: add filter on project task list
 2018-05-25 10:56:10 +02:00
Laurent Destailleur
034752dc0b Update tasks.php 2018-05-25 10:54:17 +02:00
Laurent Destailleur
e7cfad0e60 Update tasks.php 2018-05-25 10:52:24 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
ATM-Nicolas
a455f60c42 FIX : Add calls to fetchComments function 2018-05-22 16:07:32 +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
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
florian HENRY
dd946dd197 add ressource 2018-05-21 11:03:48 +02:00
Laurent Destailleur
fa7f81c828 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:38:26 +02:00
Laurent Destailleur
a450f99e8a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-05-18 11:38:11 +02:00
Laurent Destailleur
162d271884 Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject 
FIX 7.0 task contact card without withproject parameters
 2018-05-18 11:29:11 +02:00
Laurent Destailleur
71f8971a8e Merge pull request #8794 from ATM-Nicolas/fix_select_user 
FIX : Select user on add time spent form
 2018-05-18 11:27:05 +02:00
florian HENRY
a27c263747 NEW: add filter on project task list 2018-05-18 10:33:32 +02:00
florian HENRY
1b4dcefcb0 fix hookname as uniq by card 2018-05-18 08:52:13 +02:00
alexis Algoud
5c727c077b fix task contact card without withproject parameters 2018-05-16 16:34:19 +02:00
florian HENRY
630e38072b fix SQL and add hook 2018-05-15 17:02:54 +02:00
Laurent Destailleur
9552a914d8 FIX link for projets not linked to a thirdparties 2018-05-14 15:16:19 +02:00
ATM-Nicolas
ca09fddfb3 FIX : Select user on add time spent form 2018-05-14 15:16:07 +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
Laurent Destailleur
8b4b786969 Merge pull request #8730 from atm-arnaud/FIX_project_list_label 
FIX label in getnomurl projectlist
 2018-05-05 13:26:11 +02:00
Laurent Destailleur
2f79a12c6b Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter 
fix project and task visibility same as list
 2018-05-05 13:13:25 +02:00
Laurent Destailleur
8e2844b295 css 2018-05-04 17:55:29 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
atm-arnaud
6245f25deb FIX label in getnomurl projectlist 2018-05-03 11:47:31 +02:00
florian HENRY
46e94af594 fix taskid 2018-05-02 19:46:04 +02:00