Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
This commit is contained in:
Laurent Destailleur
2015-01-31 14:29:15 +01:00
parent d0cc56d616 c667f8734a
commit 770ddb6b0f
6 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/margin/lib/margins.lib.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -77,10 +77,15 @@ function marges_prepare_head()
$h++;
}
if ($user->rights->margin->read->all) {
$title = 'UserMargins';
} else {
$title = 'SalesRepresentativeMargins';
}
$head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php";
$head[$h][1] = $langs->trans("SalesRepresentativeMargins");
$head[$h][1] = $langs->trans($title);
$head[$h][2] = 'agentMargins';
$h++;
return $head;
}