Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php		2015-01-18 17:13:42 +01:00
..
admin	Fix : [ bug #1549 ] Itïs not possible add ExtraFields	2014-08-06 17:38:44 +02:00
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
tpl	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
card.php	Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling	2014-12-28 18:56:23 +01:00
contact.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
document.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
info.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
list.php	Update /contrat/list.php	2014-11-23 17:43:48 +01:00
note.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
services.php	Update /contrat/services.php	2014-11-23 17:43:44 +01:00