Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php		2015-01-18 18:44:22 +01:00
..
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-18 18:44:22 +01:00
rapport	Fix: Miscellaneous fixes for multicompany	2014-12-06 14:41:56 +01:00
card.php	Fixed: Do not show disabled user when creating a new event.	2014-12-25 12:04:39 +01:00
document.php	Fix divers	2014-11-07 23:07:15 +01:00
index.php	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into	2015-01-17 15:11:12 +01:00
info.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
listactions.php	Fix: The filter into event views on user must be done on assigned	2015-01-15 02:06:04 +01:00
peruser.php	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into	2015-01-17 15:11:12 +01:00