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

Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php

2016-10-01 18:42:50 +02:00

..

admin

NEW Support extrafields on product lot.

2016-09-12 17:27:44 +02:00

ajax

Fix #5712

2016-09-11 23:01:04 +02:00

canvas

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

class

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

2016-10-01 18:42:50 +02:00

composition

Uniformize code and style

2016-09-18 14:41:17 +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-09-29 10:49:47 +02:00

card.php

Complete param of setValueFrom

2016-09-12 20:16:39 +02:00

document.php

NEW the list of linked files on card does not forget external links.

2016-09-12 18:37:40 +02:00

fournisseurs.php

Uniformize presentation

2016-08-10 07:40:40 +02:00

index.php

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

2016-08-31 16:16:19 +02:00

info.php

Fix: Info tab on product card - Double header

2016-09-01 22:39:01 +02:00

list.php

FIX Option strict mode compatibility

2016-07-15 19:35:01 +02:00

note.php

Work on dol_banner for proposals.

2016-09-18 21:38:20 +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

Uniformize code and style

2016-09-18 14:41:17 +02:00

reassort.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-09-12 01:50:38 +02:00

reassortlot.php

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

2016-09-12 02:05:38 +02:00

traduction.php

Uniformize code and style

2016-09-18 14:41:17 +02:00