Laurent Destailleur 9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php		2016-09-12 02:05:38 +02:00
..
admin	[Qual] comments should be in english	2015-12-22 09:37:27 +01:00
class	sql syntax	2016-09-02 21:48:02 +02:00
tpl	FIX Creating a supplier order from proposal order	2016-06-04 02:39:13 +02:00
card.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +02:00
document.php	FIX The include file for action on files should not be a template file	2016-04-02 14:16:16 +02:00
index.php	Fix several bugs on css, translation or look	2016-01-01 23:44:23 +01:00
info.php
list.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +02:00
note.php	Fix missing information on main supplier proposal card, not on note tab.	2016-09-10 17:35:08 +02:00