Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php		2015-06-29 00:09:28 +02:00
..
tpl	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-05 18:31:53 +02:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-29 00:09:28 +02:00
contact.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
dispatch.php	FIX can receive new batch product on supplier order	2015-06-18 19:49:19 +02:00
document.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
history.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
index.php	Working on finishing of look	2015-05-22 14:28:02 +02:00
list.php	Fix: link must not be visible if module disabled	2015-04-13 13:22:12 +02:00
note.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
orderstoinvoice.php	Fix: print_liste_field_titre('');	2015-06-26 06:23:29 +02:00