Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
43,243 Commits 36 Branches 189 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

160 Commits

Author SHA1 Message Date
phf
824da6d2b0 FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE 2015-07-27 17:38:27 +02: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
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
Florian HENRY
bd8b393d8a Fix [ bug #1740 ] Clone project make task date crazy 2014-12-05 21:25:43 +01:00
Alexis Algoud
d177a2fbb4 fix bug on thm 2014-11-04 16:13:51 +01:00
Laurent Destailleur
a853aed348 Fix: Some fields not visibles. Wrong value for calculated time. 2014-10-03 03:42:11 +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
Raphaël Doursenaud
367d225d3e Fixed missing class include for task duplication 2014-09-08 16:13:29 +02:00
Raphaël Doursenaud
c5ccf2998b Fixed forgotten rename 2014-09-08 16:13:03 +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
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/projet/class/project.class.php
 2014-08-08 01:09:46 +02:00
Laurent Destailleur
e8ffb0dacf Fix: sql error on editing project with pgsql. 
Fix: Error management on project edit.
 2014-08-08 01:02:59 +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
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
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +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
Laurent Destailleur
e8bca38daf Fix: syntax error 2014-06-14 13:41:15 +02:00
Laurent Destailleur
1a9e53e21f Fxi: Correct property name 2014-06-12 22:00:16 +02:00
Laurent Destailleur
8bf1fde598 New: Can set page to use for getNomUrl of project. 2014-05-09 13:21:10 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Florian HENRY
45e134bfef Better error return for project delete method 2014-05-07 15:11:46 +02:00
Florian HENRY
3f22bc7009 Better error management in delete project method 2014-05-07 15:08:44 +02:00
Florian HENRY
e6708a5072 Fix error return project deletion 2014-05-07 15:05:40 +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
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
BENKE Charles
c55e51d825 Update project.class.php 2014-04-19 14:59:42 +02:00
BENKE Charles
09d231ad0a Update project.class.php 2014-04-19 12:36:15 +02:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01: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
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +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
BENKE Charles
42ffb4b3e7 Update project.class.php 
escape ref of project if as ' is typed inside as ref (crazy user)
 2014-02-21 22:39:45 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Laurent Destailleur
7fd34e5ff6 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
 2014-01-06 13:34:26 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +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
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Florian Henry
8a6a3fc9f4 Continue normalizing project html.formprojet.class.php 2013-06-17 14:25:33 +02:00