Laurent Destailleur 007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into ...

GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php

2015-01-17 15:11:12 +01:00

..

export-thirdpartyaccount.php

Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into

2015-01-17 15:11:12 +01:00