Fix [ bug #742 ]
and translation of constant description
Merge pull request #710 from FHenry/3.3

Fix [ bug #742 ]
Fix [ bug #747 ]
Merge pull request #712 from FHenry/3.3

Fix [ bug #747 ]
Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10)
New : add extrafield support on propal object
Edit extrafields on propal
Fix:; Removed warning
Move substitution function for propal to common class & add extrafields display
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Merge pull request #713 from atm-maxime/develop

LDAP2Dolibarr sync script final
Display linked propal information into invoice ODT
Next step for rewriting menu managers.
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Fix: Syntax sql error when adding/editing line of contract and when
company does not use vat.
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
fix [ bug #749 ]
Add help about extrafields in ODT propal
Fix : incorrect function used to retrieve extrafields for propal
Add param to define key name in return array of substitution function
for propal