dolibarr/htdocs/margin
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 replace html by html5 in margin and modulebuilder 2019-03-03 09:08:29 +01:00
lib Fix phpcs 2019-04-02 20:36:00 +02:00
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 Merge pull request #10736 from OPEN-DSI/fix-margin-agents3 2019-03-07 20:45:40 +01:00
customerMargins.php Update customerMargins.php 2019-11-03 22:45:50 +01:00
index.php PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
productMargins.php Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-12-01 10:30:22 +01:00