Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang

2018-04-12 13:31:14 +02:00

..

bankjournal.php

NEW Add file number in accountant card and update export filename

2018-04-07 06:21:49 +02:00

expensereportsjournal.php

NEW Add file number in accountant card and update export filename

2018-04-07 06:21:49 +02:00

index.html

…

purchasesjournal.php

NEW Add file number in accountant card and update export filename

2018-04-07 06:21:49 +02:00

sellsjournal.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-04-12 13:31:14 +02:00