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
..
tpl	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
card.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +02:00
contact.php	FIX Look and feel v7	2018-03-16 12:16:40 +01:00
dispatch.php	NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders	2018-03-28 11:54:21 +02:00
document.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-17 19:50:33 +01:00
index.php	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
info.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-17 19:50:33 +01:00
list.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-08 13:10:10 +02:00
note.php	Fix permission to open supplier order	2018-01-17 15:54:27 +01:00
orderstoinvoice.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-11 01:03:13 +01:00