Commit Graph

12 Commits

Author SHA1 Message Date
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
Laurent Destailleur
a72c3d4381 Merge branch 'develop' of github.com:atm-maxime/dolibarr into
atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
2014-06-20 17:11:12 +02:00
Maxime Kohlhaas
dd83a52fb1 Fix : project list was showing all projects instead of company project. This wasn't matching the function comments. 2014-06-20 13:59:50 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
2014-06-13 15:54:37 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +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
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with
selec_project
2013-06-14 22:33:01 +02:00