Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
f285574f66
3 changed files with 3 additions and 9 deletions
|
|
@ -13116,12 +13116,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/eventorganization/conferenceorbooth_contact.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$permission might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 3
|
||||
path: ../../../htdocs/eventorganization/conferenceorbooth_contact.php
|
||||
|
||||
-
|
||||
message: '#^Call to function method_exists\(\) with Project and ''fetchComments'' will always evaluate to true\.$#'
|
||||
identifier: function.alreadyNarrowedType
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ $hookmanager->initHooks(array('thirdpartybancard', 'globalcard'));
|
|||
$permissiontoread = $user->hasRight('societe', 'lire');
|
||||
$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php
|
||||
|
||||
$permissiontoaddupdatepaymentinformation = $user->hasRight('societe', 'thirdparty_paymentinformation_advance', 'write');
|
||||
$permissiontoaddupdatepaymentinformation = $user->hasRight('societe', 'thirdparty_paymentinformation', 'write');
|
||||
|
||||
// Check permission on company
|
||||
$result = restrictedArea($user, 'societe', '', '');
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ print '<table class="noborder centpercent">';
|
|||
print '<tr class="liste_titre" height="24">';
|
||||
print '<td class="center">'.$langs->trans("Year").'</td>';
|
||||
print '<td class="right">'.$langs->trans("NbOfTickets").'</td>';
|
||||
print '<td class="right">%</td>';
|
||||
print '<td class="right opacitylow">%</td>';
|
||||
//print '<td class="right">'.$langs->trans("AmountTotal").'</td>';
|
||||
//print '<td class="right">%</td>';
|
||||
//print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
|
||||
|
|
@ -237,7 +237,7 @@ foreach ($data as $val) {
|
|||
print '<tr class="oddeven" height="24">';
|
||||
print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
|
||||
print '<td class="right">'.$val['nb'].'</td>';
|
||||
print '<td class="right" style="'.((isset($val['nb_diff']) && $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round(isset($val['nb_diff']) ? $val['nb_diff'] : 0).'</td>';
|
||||
print '<td class="right" style="'.((isset($val['nb_diff']) && $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round(isset($val['nb_diff']) ? $val['nb_diff'] : 0).'%</td>';
|
||||
//print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
|
||||
//print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
|
||||
//print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue