dolibarr/htdocs/accountancy
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
..
admin closing tag twice 2014-12-15 11:19:14 +01:00
bookkeeping missing close form 2014-12-01 12:21:54 +01:00
class Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 2015-01-17 15:11:12 +01:00
customer Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 2015-01-17 15:11:12 +01:00
journal Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 2015-01-17 15:11:12 +01:00
supplier Correct rights & presentation 2014-11-01 07:59:52 +01:00
index.html Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00