Laurent Destailleur 524dd79198 Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php		2016-08-31 00:16:07 +02:00
..
admin	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-08-05 00:42:40 +02:00
ajax	FIX We must take last recent price when using several level of prices	2016-07-11 11:35:38 +02:00
canvas	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
class	Clean code for category management.	2016-08-29 21:31:27 +02:00
composition	Uniformize presentation	2016-08-10 07:40:40 +02:00
dynamic_price	Revert "Corrected non-static usages of Form::selectarray function"	2016-03-25 15:34:37 +01:00
stats	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
stock	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
card.php	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-31 00:16:07 +02:00
document.php	Uniformize presentation	2016-08-10 07:40:40 +02:00
fournisseurs.php	Uniformize presentation	2016-08-10 07:40:40 +02:00
index.php	Minor fix on stock	2016-08-08 20:41:49 +02:00
info.php	Uniformize presentation	2016-08-10 07:40:40 +02:00
list.php	FIX Option strict mode compatibility	2016-07-15 19:35:01 +02:00
note.php	Move notes on dedicated tabs like other elements.	2016-07-28 13:53:17 +02:00
popuprop.php	FIX Bad position of parameters on llxHeader (so online help not visible)	2016-07-28 12:23:07 +02:00
price.php	NEW Can edit a label for each price segment when using several segment	2016-08-29 16:30:31 +02:00
reassort.php	Minor fix on stock	2016-08-08 20:41:49 +02:00
reassortlot.php	Fix several errors in search an sorting in stock by lot view	2016-08-09 13:14:33 +02:00
traduction.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00