Laurent Destailleur 5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql		2017-03-05 22:11:35 +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-05 22:11:35 +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	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
info.php	Update info.php	2016-12-15 15:02:45 +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	Fix css and look 5.0	2017-01-22 12:13:32 +01:00