Laurent Destailleur 59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php htdocs/product/class/product.class.php		2017-06-24 10:27:10 +02:00
..
admin	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-06-03 11:45:15 +02:00
ajax	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
canvas	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-24 10:27:10 +02:00
composition	Merge 5.0	2017-06-12 18:22:51 +02:00
dynamic_price	NEW Introduce mass action on product list ('delete' for the moment)	2017-04-09 15:02:55 +02:00
inventory	Fix syntax error	2017-06-08 14:55:12 +02:00
stats	Escape hml tags	2017-06-18 19:42:59 +02:00
stock	Look and feel v6	2017-06-21 11:37:34 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-24 10:27:10 +02:00
document.php	Merge 5.0	2017-06-12 18:22:51 +02:00
fournisseurs.php	Merge 5.0	2017-06-12 18:22:51 +02:00
index.php	Merge 5.0	2017-06-12 18:22:51 +02:00
info.php	Merge 5.0	2017-06-12 18:22:51 +02:00
list-with-listview.php	Fix code comment	2017-06-10 12:56:28 +02:00
list.php	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
note.php	Merge 5.0	2017-06-12 18:22:51 +02:00
popuprop.php	Fix syntax error	2017-06-08 14:55:12 +02:00
price.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-24 10:27:10 +02:00
reassort.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
reassortlot.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
traduction.php	Merge 5.0	2017-06-12 18:22:51 +02:00