Laurent Destailleur f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php		2016-08-02 17:43:12 +02:00
..
admin	[Qual] comments should be in english	2015-12-22 09:37:27 +01:00
class	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by	2016-07-28 19:02:23 +02:00
tpl	NEW Merge all boxes "related objects" into one. This save a lot of room	2016-03-30 19:18:31 +02:00
card.php	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by	2016-07-28 19:02:23 +02:00
contact.php	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by	2016-07-28 19:02:23 +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 missing opacity css	2016-07-24 22:24:18 +02:00
info.php	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
list.php	Fix strict sql	2016-08-02 13:45:35 +02:00
note.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
services.php	Fix filter on dates of services	2016-07-24 22:17:46 +02:00