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-02-02 02:25:49 +01:00
stats	Fix statistics of leave requests (date valid not defined if status is	2017-01-22 16:03:08 +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 dol_banner	2016-12-09 11:16:04 +01:00
customer.php	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
document.php	Fix link attachment on bank document page	2017-01-18 15:37:45 +01:00
index.php	PHP code to manage pair/impair is replaced by native CSS.	2017-03-07 22:45:22 +01:00
info.php	FIX Filter on date lost after submit on time spent page	2017-03-16 10:36:17 +01:00
list.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:11:35 +01:00
note.php	Update note.php	2016-12-15 15:04:59 +01:00
orderstoinvoice.php	Page societe/soc.php and compta/facture.php was renamed into card.php	2017-03-20 21:29:22 +01:00