Resolve conflicts
Update Changelog
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Fix: Better error management
Update ChangeLog
Fix: regresson after rename of fields
Updates
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Spelling fix
Fix: Error management and missing transactions check
update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)

Ref: https://github.com/lrq3000/odtphp/commit/b4e02a1306f4d5888b076dea808effe449b9cf3d

Signed-off-by: Stephen L. <lrq3000@gmail.com>
Qual: Mutualize code. Only one function to build address format.
Fix: Some regressions
Update case after mutualizing code.
Translation
Fix: No warning if due date unknown
Merge pull request #802 from simnandez/develop

Fix: Try to showing the events related to a intervention
Merge pull request #811 from lrq3000/develop

update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
Merge branch 'develop' into develop_orderextrafield