Merge pull request #8960 from grandoc/new_branch_13_06_2018

clean code
This commit is contained in:
Laurent Destailleur 2018-06-14 12:01:19 +02:00 committed by GitHub
commit 9717a32a2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 3 additions and 19 deletions

View File

@ -200,7 +200,6 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print '</tr>';
$var=true;
for ($mois = 1 ; $mois < 13 ; $mois++)
{

View File

@ -70,7 +70,6 @@ if ($result)
$num = $db->num_rows($result);
$i = 0; $total = 0; $totalnb = 0;
$var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);

View File

@ -402,7 +402,7 @@ print "</tr>\n";
$total = array(); $found = 0; $i=0; $lastcurrencycode='';
$var=true;
foreach ($accounts as $key=>$type)
{
if ($i >= $limit) break;
@ -412,7 +412,6 @@ foreach ($accounts as $key=>$type)
$obj = new Account($db);
$obj->fetch($key);
$var = !$var;
$solde = $obj->solde(1);
if (! empty($lastcurrencycode) && $lastcurrencycode != $obj->currency_code)

View File

@ -115,8 +115,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
print '<td align="right" width="80">'.$langs->trans("BankBalance").'</td>';
print '</tr>';
$var=true;
// Current balance
print '<tr class="liste_total">';

View File

@ -138,7 +138,6 @@ if ($result)
$num = $db->num_rows($result);
$i = 0;
$total = 0 ;
$var=true;
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);

View File

@ -166,12 +166,10 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$total = 0;
$totalnb = 0;
$totalpaye = 0;
$var=true;
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($resql);
$var = !$var;
print '<tr class="oddeven">';
// Date
$date=$obj->periode;
@ -417,14 +415,13 @@ while($j<$numlt)
print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
$var=1;
while ($i < $num)
{
$obj = $db->fetch_object($result);
$total = $total + $obj->amount;
print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
@ -501,7 +498,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
if (! empty($conf->banque->enabled)) print_liste_field_titre("Account",$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
$var=1;
while ($i < $num)
{
$obj = $db->fetch_object($result);

View File

@ -169,7 +169,6 @@ if ($resql)
print '</td>';
print "</tr>\n";
$var=true;
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
@ -177,7 +176,6 @@ if ($resql)
$soc = new Societe($db);
if ($obj->socid) $soc->fetch($obj->socid);
print '<tr class="oddeven">';
// Id
print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';

View File

@ -181,7 +181,6 @@ if($calc ==0 || $calc == 2)
if (is_array($coll_list))
{
$var=true;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)
@ -256,7 +255,6 @@ if($calc ==0 || $calc == 1){
$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if (is_array($coll_list))
{
$var=true;
$total = 0; $totalamount = 0;
$i = 1;
foreach($coll_list as $coll)

View File

@ -68,7 +68,6 @@ print "</tr>\n";
if ($resql)
{
$var=false;
if ($row = $db->fetch_row($resql) )
{
$num = $row[0];
@ -114,7 +113,6 @@ if ($resql)
print '<th align="right">'.$langs->trans("Status").'</th>';
print "</tr>\n";
$var=true;
while ( $objp = $db->fetch_object($resql) )
{
$checkdepositstatic->id=$objp->rowid;

View File

@ -195,7 +195,6 @@ if ($resql)
if ($num > 0)
{
$var=true;
while ($i < min($num,$limit))
{
$objp = $db->fetch_object($resql);