Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php		2018-05-05 14:40:39 +02:00
..
admin	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-05 14:40:39 +02:00
bookkeeping	Merge pull request #8659 from aspangaro/8.0-a24	2018-04-22 20:30:42 +02:00
class	fix accountanty in multientity	2018-05-01 12:30:22 +02:00
customer	FIX When on a high page and searching for a small result, list was not	2018-04-24 11:37:57 +02:00
expensereport	FIX When on a high page and searching for a small result, list was not	2018-04-24 11:37:57 +02:00
journal	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +02:00
supplier	FIX When on a high page and searching for a small result, list was not	2018-04-24 11:37:57 +02:00
tpl	Fix export balance	2018-04-15 07:49:54 +02: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
index.php	Accountancy - move to loadLangs	2018-04-18 06:20:34 +02:00