Laurent Destailleur 6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php		2015-02-23 14:59:24 +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	Restore data into bannner of thirdparty to have content matching other	2015-02-20 23:29:55 +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