Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php

Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount

Change to $listofcurrenciesbefore for GBP + AUD

Psr2

Allow warehouse transfer for batched product

Add some "classfortooltip"

Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php

Update en_AU separator from comma to full stop

Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php

service

Custom dir will be installed by default.

Updating the en_AU Main Language - Decimal Separator from a Comma to a Full Stop

Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php

Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'

Fixed error deleting survey comment

Miscellaneous corrections

Several Contract-related fixes

Enhance select_categories with select2

Update card.php

Update facture.php

Update facture.php

Project searching by year

FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)

Typo

Attribut width not allowed with div or span

Fix Lang for Check Payment Type

Add module accountancy expert in auguria menu

Update cidlookup.php