Laurent Destailleur 770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-task-1793 Conflicts: ChangeLog htdocs/margin/lib/margins.lib.php		2015-01-31 14:29:15 +01:00
..
admin	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
lib	Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into	2015-01-31 14:29:15 +01:00
tabs	Fixed: [ bug #1654 ] Can't display margins in product card	2014-12-14 15:44:22 +01:00
agentMargins.php	[ task #1793 ] Create new permission to restrict commercial agent margin to logged user	2015-01-18 16:42:11 +01:00
customerMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-18 11:42:55 +01:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
productMargins.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-23 16:51:25 +01:00