Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

1865 Commits

Author SHA1 Message Date
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Cubexed
8a3bc25029 -Renamed POST "project" to "projectstart" to avoid strange behavior at project start date selector, probably the generic name "project" was interfering with something 2014-09-12 17:21:48 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +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
4a91476be3 Try cut and paste to solve pb on class project. 2014-08-28 12:26:43 +02:00
Laurent Destailleur
fc02f0f08f Fix: No new inside a constructor method. 2014-08-21 23:43:11 +02:00
Frédéric FRANCE
bac870dc3b Update project.class.php 2014-08-15 22:23:23 +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
Laurent Destailleur
aee35c86d6 Perf: Removed a useless distinct, add indexes. 2014-08-15 02:11:01 +02:00
Laurent Destailleur
5a0c66b9ad Qual: Use getNomUrl for project into list of timesheet. 2014-08-14 13:29:24 +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
4eeb92d082 Fix: Bad help text 
Fix: Removed duplicate header
 2014-08-08 02:11:03 +02:00
Laurent Destailleur
75eb9cadc7 Merge pull request #1809 from KreizIT/fix_1549 
Fix :  [ bug #1549 ] It's not possible add ExtraFields
 2014-08-08 01:52:13 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
bceb72a9d1 Fix: Missing line total 2014-08-08 01:21:57 +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
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
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +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
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:48:19 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +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
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +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
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +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
Maxime Kohlhaas
b301c54b7e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-03 08:28:00 +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
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