Laurent Destailleur 9768550696 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php		2014-10-12 02:54:34 +02:00
..
contact.php	Better ressource management on project and task	2014-09-20 10:14:26 +02:00
document.php	navigate (next/prev) error on task of project	2014-07-02 04:27:18 +02:00
index.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-18 10:17:43 +02:00
note.php	navigate (next/prev) error on task of project	2014-07-02 04:27:18 +02:00
task.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
time.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00