Laurent Destailleur 6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 ... Conflicts: htdocs/compta/tva/index.php htdocs/core/lib/pdf.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/tpl/objectline_view.tpl.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php		2019-12-01 10:30:22 +01:00
..
admin
lib
tabs	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0	2019-12-01 10:30:22 +01:00
agentMargins.php	Better translation	2019-10-08 19:35:50 +02:00
checkMargins.php
customerMargins.php	Update customerMargins.php	2019-11-03 22:45:50 +01:00
index.php
productMargins.php	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0	2019-12-01 10:30:22 +01:00