Laurent Destailleur 55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php		2018-03-12 19:02:30 +01:00
..
admin	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
ajax	fix hidepricelabel when using ajax autocompleter	2017-09-08 11:06:55 +01:00
canvas	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
class	Merge branch '7.0' into 7.0	2018-03-10 21:52:57 +01:00
composition	Fix colspan	2018-03-01 11:53:18 +01:00
dynamic_price	More informative error message in dynamics price	2017-12-06 14:51:29 +01:00
inventory	Update list.php	2018-03-10 12:54:20 +01:00
stats	Fix link to contracts	2017-12-21 23:48:33 +01:00
stock	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-12 19:02:30 +01:00
agenda.php	Fix look and feel v7	2017-12-01 15:58:35 +01:00
card.php	Update card.php	2018-02-12 03:23:57 +01:00
document.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-08 13:13:53 +01:00
fournisseurs.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-14 22:08:18 +01:00
index.php	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
list.php	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
popuprop.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
price.php	Update price.php	2018-01-11 00:40:33 +01:00
reassort.php	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
reassortlot.php	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
traduction.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00