Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
..
2019-03-13 13:42:14 +01:00
2019-11-16 09:58:14 +01:00
2019-11-16 09:58:14 +01:00
2019-11-16 09:58:14 +01:00
2019-03-13 13:40:57 +01:00
2018-04-18 00:01:06 +02:00
2018-12-04 13:17:25 +01:00
2019-12-17 12:19:35 +01:00
2019-08-12 15:18:40 +02:00
2019-08-01 16:29:42 +02:00
2019-11-19 19:02:14 +01:00
2019-12-22 11:59:38 +01:00
2019-12-22 11:59:38 +01:00