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
..
activity	Qual: Uniformize translated label of progress on all pages.	2014-10-12 01:04:34 +02:00
admin	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
class	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
tasks	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
card.php	New: add context "globalcard" for declaring only once all cards	2014-10-06 07:20:58 +02:00
contact.php	Fix: button must be align to right	2014-10-08 15:09:07 +02:00
document.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
element.php	Merge pull request #1910 from FHenry/develop	2014-09-22 23:48:32 +02:00
ganttchart.inc.php	Fix: date start/end of project was lost on some tabs.	2014-06-14 14:20:58 +02:00
ganttview.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
index.php	Merge pull request #1930 from GPCsolutions/reportprogress	2014-10-12 00:10:28 +02:00
jsgantt_language.js.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
list.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
note.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
tasks.php	Qual: Uniformize translated label of progress on all pages.	2014-10-12 01:04:34 +02:00