Marcos García de La Fuente 05728075d6 Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql		2016-09-06 21:06:33 +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	Merge branch 'develop' into prod-attr	2016-09-06 21:06:33 +02:00
contact.php	Uniformize presentation on supplier order	2016-08-03 08:25:35 +02:00
dispatch.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-09 13:26:08 +02:00
document.php	Uniformize presentation on supplier order	2016-08-03 08:25:35 +02:00
index.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-04-12 15:03:19 +02:00
info.php	Uniformize presentation on supplier order	2016-08-03 08:25:35 +02:00
list.php	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
note.php	Uniformize presentation on supplier order	2016-08-03 08:25:35 +02:00
orderstoinvoice.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-07-06 15:11:29 +02:00