Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
Merge pull request #697 from grandoc/develop

english language standardization
Merge pull request #698 from grandoc/develop

english language standardization
Fix: Update button does not appear
Fix: Update button does not appear
Fix: trans
Fix: trans
Fix: select lost if error
Fix: Update of type was not working.
Merge remote-tracking branch 'origin/3.3' into develop
Qual: Rewrite of menu manager. next step.
Civility not required in a short label
New: dol_syslog method accept a suffix to use different log files for
log.
Start to work onto payment return
Uniformize code
Update index.php

rename search_product by search_project (the real search thing)
Update to 3.4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix launchpad conflicts