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	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
lib	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
tabs	Fixed: [ bug #1654 ] Can't display margins in product card	2014-12-14 15:44:22 +01:00
agentMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-26 04:44:15 +01:00
customerMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-18 11:42:55 +01:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
productMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-23 16:51:25 +01:00