Laurent Destailleur ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/actions_sendmails.inc.php

2017-09-16 12:22:18 +02:00

..

admin

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-08-23 16:11:51 +02:00

ajax

fix hidepricelabel when using ajax autocompleter

2017-09-08 11:06:55 +01:00

canvas

Start remove $GLOBALS

2017-09-12 19:49:07 +02:00

class

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

composition

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-09-16 12:22:18 +02:00

dynamic_price

Fix use the getUrl function instead of hard coded curl

2017-07-04 10:55:53 +02:00

inventory

Fix HTML5 use of <br> is preferred to <br />

2017-09-15 23:49:04 +02:00

stats

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

stock

Fix HTML5 use of <br> is preferred to <br />

2017-09-15 23:49:04 +02:00

card.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

document.php

Fix GETPOST of lang_id

2017-06-27 17:27:01 +02:00

fournisseurs.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +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.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

note.php

Merge 5.0

2017-06-12 18:22:51 +02:00

popuprop.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

price.php

Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook

2017-08-17 18:25:30 +02:00

reassort.php

NEW Default filter and sort order can use partial list of query

2017-09-11 00:02:52 +02:00

reassortlot.php

NEW The lot of a product uses the link and picto when shown into list.

2017-09-15 10:45:41 +02:00

traduction.php

Merge 5.0

2017-06-12 18:22:51 +02:00