Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql

Conflicts:
	htdocs/commande/list.php

Conflicts:
	htdocs/commande/list.php

FIX input stock value not display

Add label tag

Situation total row left a col if bank enabled

[Expense report] - fix the load board query

FIX : param billed when we change page

there is several vat line with same rate.

product price.

filled to create the record.

Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang