lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix somes code formating errors

Browse Source
This commit is contained in:
DEMAREST Maxime (Indelog) 2020-05-06 13:37:24 +02:00
parent 128ec6fd78
commit bf8cd51a5a
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/resultat/clientfourn.php
View File

@ -977,7 +977,6 @@ else
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
// Debit // Debit
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
if (isset($obj->amount)) if (isset($obj->amount))
@ -1012,7 +1011,6 @@ else
print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>'; print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>'; print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
print '</tr>'; print '</tr>';
} }
else dol_print_error($db); else dol_print_error($db);
} }
@ -1055,7 +1053,6 @@ else
$subtotal_ht -= $obj->amount; $subtotal_ht -= $obj->amount;
$subtotal_ttc -= $obj->amount; $subtotal_ttc -= $obj->amount;
} }
$total_ht += $subtotal_ht; $total_ht += $subtotal_ht;
$total_ttc += $subtotal_ttc; $total_ttc += $subtotal_ttc;
print '<tr class="liste_total">'; print '<tr class="liste_total">';
@ -1067,7 +1064,6 @@ else
else dol_print_error($db); else dol_print_error($db);
} }
/* /*
* VAT * VAT
*/ */

12
htdocs/compta/resultat/index.php
View File

@ -801,7 +801,6 @@ elseif ($modecompta == 'BOOKKEEPING') {
if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{ {
// decaiss // decaiss
$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p"; $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
@ -863,9 +862,9 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
} }
} }
elseif ($modecompta == 'BOOKKEEPING') {
// Useless with BOOKKEEPING // Useless with BOOKKEEPING
} //elseif ($modecompta == 'BOOKKEEPING') {
//}
/* /*
* Payement Loan * Payement Loan
@ -873,7 +872,6 @@ elseif ($modecompta == 'BOOKKEEPING') {
if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{ {
$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p"; $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
$sql .= ' WHERE 1 = 1'; $sql .= ' WHERE 1 = 1';
if (!empty($date_start) && !empty($date_end)) if (!empty($date_start) && !empty($date_end))
@ -903,9 +901,9 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
} }
} }
elseif ($modecompta == 'BOOKKEEPING') { // Useless with BOOKKEEPING
// Not use with BOOKKEEPING //elseif ($modecompta == 'BOOKKEEPING') {
} //}
/* /*