Fix warining message during societe activation
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Same bug, missing select column use in result
Fix: Easy fix to solve pb with pagebreak when adding image
Merge pull request #1640 from FHenry/3.5

3.5
fix: remise_client history
Start fix [ bug #1437 ] Securitu Issue

Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
Merge pull request #1645 from FHenry/3.5

Start fix [ bug #1437 ] Securitu Issue
Fix: Confusion between is_int and is_numeric.
Merge remote-tracking branch 'origin/3.5' into develop
Merge pull request #1646 from marcosgdf/develop

CR Fix
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
Typo
Fixed the bug for supplier invoice and supplier order pages
Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card
Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment
Merge pull request #1648 from marcosgdf/bug-1415

Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
Merge pull request #1643 from fappels/develop

fix: remise_client history
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1416

Conflicts:
	ChangeLog