Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang		2018-04-12 13:31:14 +02:00
..
admin	Clean code	2018-04-09 14:25:15 +02:00
bookkeeping	Merge branch 'develop' into 8.0-a15	2018-04-11 13:17:12 +02:00
class	Merge branch 'develop' into 8.0-a15	2018-04-11 13:17:12 +02:00
customer	FIX Add a test to avoid to reset binding by error.	2018-03-27 13:08:16 +02:00
expensereport	FIX Add a test to avoid to reset binding by error.	2018-03-27 13:08:16 +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 Add a test to avoid to reset binding by error.	2018-03-27 13:08:16 +02:00
tpl	NEW Add file number in accountant card and update export filename	2018-04-07 06:21:49 +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	Fix size of image by using fa picto	2017-11-07 00:18:55 +01:00