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
..
class	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
stats	Removed closing php tag	2014-05-03 18:18:44 +02:00
tpl	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
apercu.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
card.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
contact.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
customer.php	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00
document.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
index.php	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00
info.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +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
orderstoinvoice.php	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00