lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,983 Commits 43 Branches 150 Tags 886 MiB
6.0
Commit Graph

382 Commits

Author SHA1 Message Date
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
477b9c8338 Fix duplicate view of agenda/events for projects 2017-01-02 12:34:23 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
bd0b017571 Missing filters 2016-12-06 12:13:03 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
f4fb07b570 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-22 19:45:38 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +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
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
Laurent Destailleur
71a573df61 FIX Pb in management of date end of projects 2016-11-09 17:46:30 +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
fe471c43d1 Minor css enhancement 2016-10-16 18:28:09 +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
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +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
2a6d8e77db FIX Lost filter on opportunities 2016-09-30 11:45:36 +02:00
florian HENRY
90466f37a7 travis comment 2016-08-29 11:10:30 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
2a6ab47689 NEW Can change thirdparty when cloning a project. 2016-07-21 12:47:56 +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
bfb48ecce9 Where is the info tab of project ? 2016-07-09 15:30:42 +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
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +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
geoffrey.girard
0a5ded20a3 FIX extrafield cloned on project clone 2016-06-24 15:27:47 +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
473ab18306 Fix link on workboard 
Fix warning picto is missing on task list
 2016-06-06 15:48:41 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +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
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
8189a5eadd Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-22 12:58:34 +01:00
Laurent Destailleur
99ceb006e4 FIX Bad include and param for project numbering module call 2016-03-21 11:47:32 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Laurent Destailleur
1df8e50a1b NEW Add statistics on number of projets on home page 2016-02-28 00:19:12 +01:00
Laurent Destailleur
7c2ac4b3ee NEW The probability of lead/opportunity can be defined per lead. 2016-01-28 20:04:02 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +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
55dc6c31fc Minor performance enhancement 2016-01-21 14:12:17 +01:00
Laurent Destailleur
0f456c46ab Clean project pages to work like other modules 2016-01-18 16:43:15 +01: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
03eccb3336 Prepare database to be able to manage a different opportunity 
probability for each opportunity.
 2016-01-10 19:48:59 +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
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01: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
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
85c34af019 [Qual] Replaced deprecated dol_json_*() 2015-09-24 18:57:05 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +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
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +02:00
Laurent Destailleur
8d77667764 Bad stat report 2015-07-10 10:42:42 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +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
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
b98999c9d9 Can't delete a project 2015-06-05 15:41:27 +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
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00
Laurent Destailleur
f7eaf35d30 NEW When creating order, proposal or invoice from thirdparty card, the 
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
 2015-06-03 11:55:39 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +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
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +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
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00: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
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