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
..
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:11:35 +01:00
stats	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
tpl	NEW Show subtotal into list of linked elements	2016-11-08 19:19:30 +01:00
apercu.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +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	Complete work on the new dol_banner	2016-12-03 21:29:49 +01:00
document.php	Uniformize code	2016-10-28 18:40:26 +02:00
index.php	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
info.php	Complete work on the new dol_banner	2016-12-03 21:29:49 +01:00
list.php	Fix list of supplier proposals	2017-02-17 01:41:33 +01:00
note.php	Complete work on dol_banner	2016-12-23 14:52:25 +01:00