commit
9717a32a2e
@ -200,7 +200,6 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
|
|||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$var=true;
|
|
||||||
for ($mois = 1 ; $mois < 13 ; $mois++)
|
for ($mois = 1 ; $mois < 13 ; $mois++)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -70,7 +70,6 @@ if ($result)
|
|||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$i = 0; $total = 0; $totalnb = 0;
|
$i = 0; $total = 0; $totalnb = 0;
|
||||||
|
|
||||||
$var=true;
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$objp = $db->fetch_object($result);
|
$objp = $db->fetch_object($result);
|
||||||
|
|||||||
@ -402,7 +402,7 @@ print "</tr>\n";
|
|||||||
|
|
||||||
|
|
||||||
$total = array(); $found = 0; $i=0; $lastcurrencycode='';
|
$total = array(); $found = 0; $i=0; $lastcurrencycode='';
|
||||||
$var=true;
|
|
||||||
foreach ($accounts as $key=>$type)
|
foreach ($accounts as $key=>$type)
|
||||||
{
|
{
|
||||||
if ($i >= $limit) break;
|
if ($i >= $limit) break;
|
||||||
@ -412,7 +412,6 @@ foreach ($accounts as $key=>$type)
|
|||||||
$obj = new Account($db);
|
$obj = new Account($db);
|
||||||
$obj->fetch($key);
|
$obj->fetch($key);
|
||||||
|
|
||||||
$var = !$var;
|
|
||||||
$solde = $obj->solde(1);
|
$solde = $obj->solde(1);
|
||||||
|
|
||||||
if (! empty($lastcurrencycode) && $lastcurrencycode != $obj->currency_code)
|
if (! empty($lastcurrencycode) && $lastcurrencycode != $obj->currency_code)
|
||||||
|
|||||||
@ -115,8 +115,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
|
|||||||
print '<td align="right" width="80">'.$langs->trans("BankBalance").'</td>';
|
print '<td align="right" width="80">'.$langs->trans("BankBalance").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
// Current balance
|
// Current balance
|
||||||
|
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
|
|||||||
@ -138,7 +138,6 @@ if ($result)
|
|||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$total = 0 ;
|
$total = 0 ;
|
||||||
$var=true;
|
|
||||||
|
|
||||||
$param='';
|
$param='';
|
||||||
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
|
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
|
||||||
|
|||||||
@ -166,12 +166,10 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
|
|||||||
$total = 0;
|
$total = 0;
|
||||||
$totalnb = 0;
|
$totalnb = 0;
|
||||||
$totalpaye = 0;
|
$totalpaye = 0;
|
||||||
$var=true;
|
|
||||||
|
|
||||||
while ($i < min($num, $limit))
|
while ($i < min($num, $limit))
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
$var = !$var;
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
// Date
|
// Date
|
||||||
$date=$obj->periode;
|
$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("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_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$var=1;
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
|
|
||||||
$total = $total + $obj->amount;
|
$total = $total + $obj->amount;
|
||||||
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
|
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);
|
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_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$var=1;
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
|
|||||||
@ -169,7 +169,6 @@ if ($resql)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$var=true;
|
|
||||||
while ($i < min($num,$limit))
|
while ($i < min($num,$limit))
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
@ -177,7 +176,6 @@ if ($resql)
|
|||||||
$soc = new Societe($db);
|
$soc = new Societe($db);
|
||||||
if ($obj->socid) $soc->fetch($obj->socid);
|
if ($obj->socid) $soc->fetch($obj->socid);
|
||||||
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
// Id
|
// Id
|
||||||
print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
|
print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
|
||||||
|
|||||||
@ -181,7 +181,6 @@ if($calc ==0 || $calc == 2)
|
|||||||
|
|
||||||
if (is_array($coll_list))
|
if (is_array($coll_list))
|
||||||
{
|
{
|
||||||
$var=true;
|
|
||||||
$total = 0; $totalamount = 0;
|
$total = 0; $totalamount = 0;
|
||||||
$i = 1;
|
$i = 1;
|
||||||
foreach($coll_list as $coll)
|
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
|
$reshook=$hookmanager->executeHooks('addVatLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
|
||||||
if (is_array($coll_list))
|
if (is_array($coll_list))
|
||||||
{
|
{
|
||||||
$var=true;
|
|
||||||
$total = 0; $totalamount = 0;
|
$total = 0; $totalamount = 0;
|
||||||
$i = 1;
|
$i = 1;
|
||||||
foreach($coll_list as $coll)
|
foreach($coll_list as $coll)
|
||||||
|
|||||||
@ -68,7 +68,6 @@ print "</tr>\n";
|
|||||||
|
|
||||||
if ($resql)
|
if ($resql)
|
||||||
{
|
{
|
||||||
$var=false;
|
|
||||||
if ($row = $db->fetch_row($resql) )
|
if ($row = $db->fetch_row($resql) )
|
||||||
{
|
{
|
||||||
$num = $row[0];
|
$num = $row[0];
|
||||||
@ -114,7 +113,6 @@ if ($resql)
|
|||||||
print '<th align="right">'.$langs->trans("Status").'</th>';
|
print '<th align="right">'.$langs->trans("Status").'</th>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$var=true;
|
|
||||||
while ( $objp = $db->fetch_object($resql) )
|
while ( $objp = $db->fetch_object($resql) )
|
||||||
{
|
{
|
||||||
$checkdepositstatic->id=$objp->rowid;
|
$checkdepositstatic->id=$objp->rowid;
|
||||||
|
|||||||
@ -195,7 +195,6 @@ if ($resql)
|
|||||||
|
|
||||||
if ($num > 0)
|
if ($num > 0)
|
||||||
{
|
{
|
||||||
$var=true;
|
|
||||||
while ($i < min($num,$limit))
|
while ($i < min($num,$limit))
|
||||||
{
|
{
|
||||||
$objp = $db->fetch_object($resql);
|
$objp = $db->fetch_object($resql);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user