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-12-16 12:06:25 +00:00
2019-12-16 20:21:06 +01:00
2019-12-23 14:13:26 +01:00
2019-12-11 23:04:27 +01:00
2019-12-23 12:24:27 +01:00
2019-11-13 18:37:08 +00:00
2019-12-19 13:42:13 +01:00
2019-12-23 14:13:26 +01:00
2019-12-18 23:12:31 +01:00
2019-12-18 14:20:36 +00:00
2019-12-08 23:45:06 +01:00
2019-11-11 22:59:36 +00:00
2019-11-13 18:37:08 +00:00
2019-12-14 14:53:49 +01:00
2019-12-18 14:20:36 +00:00
2019-12-23 12:24:27 +01:00
2019-12-16 12:06:25 +00:00
2019-10-31 20:46:31 +01:00
2019-12-18 23:12:31 +01:00
2019-12-12 10:31:08 +01:00
2019-11-14 11:09:46 +00:00
2019-12-09 09:35:58 +00:00