Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php

Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php

Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes

marcosgdf-bug-1784

Conflicts:
	ChangeLog

marcosgdf-bug-1717

Conflicts:
	ChangeLog

marcosgdf-bug-1783

Conflicts:
	ChangeLog

marcosgdf-bug-1796

Conflicts:
	ChangeLog

marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php

marcosgdf-bug-1803

Conflicts:
	ChangeLog

marcosgdf-bug-1804

Conflicts:
	ChangeLog

Fix Creating default object from empty on supplier order confirmation

Conflicts:
	ChangeLog

Update commondocgenerator.class.php

Update card.php

marcosgdf-bug-1762

Conflicts:
	ChangeLog

Printing System which may accept modules

Conflicts:
	htdocs/custom/.gitignore

Ignore content of directory custom

marcosgdf-bug-1785

Conflicts:
	ChangeLog

Fix: [ bug #1765 ] Unable to create a contract

marcosgdf-bug-1802

Conflicts:
	ChangeLog