Update consumption.php

security access fix : we don't have right to access of invoice and order if we are not agreed

person is on, box addon was broken.

translate.

is not enabled.

is not enabled.

Fix: must use html syntax, not xml

Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php

translated.

s'appliquent pas

s'appliquent pas

changelog

Mauvais libellé utilisé pour statut commande

orders

Corrected VAT expenses behaviour name

Fix Link product, In list view and label product

Update impayees.php

order/invoice.

Conflicts:
	htdocs/contrat/class/contrat.class.php

special circumstances