Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt
Fix : bad name of property when retrieve extrafields for thirdparty
Missing object $langs when showing extrafield of type 'price'
Fix : in ODT show value and not label of company extrafield
Missing variable declaration
Split extrafields display into 2 columns (thirdparty)
In ODT document add currency symbol with extrafields of type "price"
Merge branch 'extra_odt' into extrafields
Merge branch 'extrafields' into fgd

Conflicts:
	htdocs/core/class/commondocgenerator.class.php