Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php

when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.

when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.

Fix lastrowid-*table* option when defining imports

FIXED: Bankjournal is generated from id_account now

Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.

Fix no input outside tr-td

fields.
Fix Missing escapment
Fix new field delivery date was only into edit page

Signed-off-by: Stephen L. <lrq3000@gmail.com>

[FIX #1833] Permissions in contact/note.php wrong

tabs.

Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients

marcosgdf-bug-1790

Conflicts:
	ChangeLog

Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php

Fix: [ bug #1846 ] Browser IE11 not detected

accepting all html tags from templates.