Laurent Destailleur 3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2017-03-23 12:52:19 +01:00
..
tpl	FIX #6315	2017-02-02 02:53:32 +01:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 12:52:19 +01:00
contact.php	Fix permission	2017-01-22 23:08:11 +01:00
document.php	Fix permission	2017-01-22 23:08:11 +01:00
impayees.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Fix permission	2017-01-22 23:08:11 +01:00
list.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-08 10:57:02 +01:00
note.php	Fix permission	2017-01-22 23:08:11 +01:00
paiement.php	Page societe/soc.php and compta/facture.php was renamed into card.php	2017-03-20 21:29:22 +01:00
rapport.php	Report of supplier payment is name "supplier_payments"	2017-02-06 20:37:42 +01:00