Laurent Destailleur f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php

2017-07-08 18:32:34 +02:00

..

doc

…

mod_supplier_payment_brodator.php

Fix 7109 - class name already exist for customer payment

2017-07-05 16:52:37 +02:00

mod_supplier_payment_bronan.php

Fix 7109 - class name already exist for customer payment

2017-07-05 16:52:37 +02:00

modules_supplier_payment.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-07-08 18:32:34 +02:00