Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php		2015-01-18 18:44:22 +01:00
..
action	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
admin	Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now	2014-12-04 13:20:56 +01:00
mailing	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
propal	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
prospect	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
address.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	Add some "classfortooltip"	2015-01-09 00:07:54 +01:00
list.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-26 04:57:55 +01:00
multiprix.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
propal.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
recap-client.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
remise.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
remx.php	Replace <center> tags	2014-11-25 20:13:43 +01:00