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

Conflicts:
	htdocs/user/card.php

2017-08-26 22:33:56 +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

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 '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-08-24 14:26:45 +02:00

composition

Merge 5.0

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

dynamic_price

Fix use the getUrl function instead of hard coded curl

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

inventory

Fix new generic classes system

2017-07-25 01:21:20 +02:00

stats

Fix translation done twice into field title of array

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

stock

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

2017-08-02 17:56:09 +02:00

card.php

Merge pull request #7253 from altatof/fix_restrictedarea_parms

2017-08-17 17:22:36 +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-with-listview.php

Fix remove warnings

2017-07-13 00:35:10 +02:00

list.php

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

2017-08-26 22:33:56 +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

Fix translation done twice into field title of array

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

reassortlot.php

Fix translation done twice into field title of array

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

traduction.php

Merge 5.0

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