Fix : bad method name for prospect status
Add select list in extrafields type
Merge branch 'extrafields' into fgd

Conflicts:
	htdocs/core/admin_extrafields.inc.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into fgd
Merge branch 'extra_odt' into fgd
Merge branch 'extra_odt' into fgd
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
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into fgd

Conflicts:
	htdocs/comm/prospect/list.php
Merge branch 'extrafields' into fgd

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
Merge branch 'extra_odt' into fgd
Qual: Try to delete no more used addpropal.php
fix : english normalization
fix : english normalization
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
New: [ task #707 ] Create option ProfIdx are mandatory to validate a
invoice
New: Add some carrier
Trad: Update translations
Trad: Fix activity box translation