Laurent Destailleur 86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php		2017-06-18 21:13:48 +02:00
..
ajax	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
class	Fix travis	2017-06-10 16:19:33 +02:00
commande	Fix look and feel v6	2017-06-14 11:28:42 +02:00
facture	Fix look and feel v6	2017-06-14 11:28:42 +02:00
js	New add shipping and dispatching from/to multiple warehouses	2015-12-18 18:00:31 +01:00
paiement	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-27 17:20:40 +02:00
product	Fix syntax error	2017-06-08 14:55:12 +02:00
card.php	Fix code comment	2017-06-10 12:56:28 +02:00
contact.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
index.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
recap-fourn.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00