Add nl_NL margin translation
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
fix bad rounding on margin calculation and display
Merge pull request #1267 from FHenry/3.4

Add nl_NL margin translation
Merge pull request #1272 from altairis-fr/rounding

fix bad rounding on margin calculation and display
add custom tabs on soc
Fix: Try a fix to avoid error on big sql
Fix: Option drop tables was broken
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: Option drop tables was broken
Prepare for 3.4.2
Fix: Sub level of dir must not always be visible. So I added parameter
"showrelpart". Default value is old behaviour (only filenmae is
visible).
Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
Modify the presentation of the card
Merge pull request #1276 from aspangaro/develop

Modify the presentation of the card
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr
Merge branch 'develop-dolibarr' into features/custom_societe_type