@@ -237,8 +237,8 @@ discard block |
||
237 | 237 | // Total debit-credit |
238 | 238 | print '<tr class="liste_total"><td class="borderrightlight liste_total"><b>'.$langs->trans("Total")."</b></td>"; |
239 | 239 | for ($annee = $year_start; $annee <= $year_end; $annee++) { |
240 | - print '<td class="right nowraponall liste_total"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>'; |
|
241 | - print '<td class="right nowraponall liste_total borderrightlight"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>'; |
|
240 | + print '<td class="right nowraponall liste_total"><b>'.(isset($totsorties[$annee]) ? price($totsorties[$annee]) : '').'</b></td>'; |
|
241 | + print '<td class="right nowraponall liste_total borderrightlight"><b>'.(isset($totentrees[$annee]) ? price($totentrees[$annee]) : '').'</b></td>'; |
|
242 | 242 | } |
243 | 243 | print "</tr>\n"; |
244 | 244 | |
@@ -479,9 +479,9 @@ discard block |
||
479 | 479 | unset($tblyear[2]); |
480 | 480 | |
481 | 481 | print '<div class="fichecenter"><div class="fichehalfleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside. |
482 | - print $show2; // debit |
|
482 | + print $show2; // debit |
|
483 | 483 | print '</div></div><div class="fichehalfright"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside. |
484 | - print $show1; // credit |
|
484 | + print $show1; // credit |
|
485 | 485 | print '</div></div></div>'; |
486 | 486 | print '<div class="clearboth"></div>'; |
487 | 487 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); |
122 | 122 | $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear); |
123 | 123 | |
124 | -$pastmonth = null; // Initialise for static analysis (could be really unseg) |
|
124 | +$pastmonth = null; // Initialise for static analysis (could be really unseg) |
|
125 | 125 | $pastmonthyear = null; |
126 | 126 | |
127 | 127 | if (empty($date_startmonth)) { |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'"; |
170 | 170 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid"; |
171 | 171 | if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) { |
172 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity); |
|
172 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = ".((int) $conf->entity); |
|
173 | 173 | } |
174 | 174 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid"; |
175 | 175 | $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal); |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | if ($mt) { |
699 | 699 | if (empty($conf->cache['accountingaccountincurrententity'][$k])) { |
700 | 700 | $accountingaccount = new AccountingAccount($db); |
701 | - $accountingaccount->fetch(0, $k, true); // $k is accounting account of the bank. |
|
701 | + $accountingaccount->fetch(0, $k, true); // $k is accounting account of the bank. |
|
702 | 702 | $conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount; |
703 | 703 | } else { |
704 | 704 | $accountingaccount = $conf->cache['accountingaccountincurrententity'][$k]; |
@@ -819,43 +819,43 @@ discard block |
||
819 | 819 | } elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) { // If payment is payment of social contribution |
820 | 820 | $bookkeeping->subledger_account = ''; |
821 | 821 | $bookkeeping->subledger_label = ''; |
822 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
822 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
823 | 823 | $bookkeeping->numero_compte = $k; |
824 | 824 | $bookkeeping->label_compte = $accountingaccount->label; |
825 | 825 | } elseif ($tabtype[$key] == 'payment_vat') { |
826 | 826 | $bookkeeping->subledger_account = ''; |
827 | 827 | $bookkeeping->subledger_label = ''; |
828 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
828 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
829 | 829 | $bookkeeping->numero_compte = $k; |
830 | 830 | $bookkeeping->label_compte = $accountingaccount->label; |
831 | 831 | } elseif ($tabtype[$key] == 'payment_donation') { |
832 | 832 | $bookkeeping->subledger_account = ''; |
833 | 833 | $bookkeeping->subledger_label = ''; |
834 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
834 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
835 | 835 | $bookkeeping->numero_compte = $k; |
836 | 836 | $bookkeeping->label_compte = $accountingaccount->label; |
837 | 837 | } elseif ($tabtype[$key] == 'member') { |
838 | 838 | $bookkeeping->subledger_account = ''; |
839 | 839 | $bookkeeping->subledger_label = ''; |
840 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
840 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
841 | 841 | $bookkeeping->numero_compte = $k; |
842 | 842 | $bookkeeping->label_compte = $accountingaccount->label; |
843 | 843 | } elseif ($tabtype[$key] == 'payment_loan') { |
844 | 844 | $bookkeeping->subledger_account = ''; |
845 | 845 | $bookkeeping->subledger_label = ''; |
846 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
846 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
847 | 847 | $bookkeeping->numero_compte = $k; |
848 | 848 | $bookkeeping->label_compte = $accountingaccount->label; |
849 | 849 | } elseif ($tabtype[$key] == 'payment_various') { |
850 | 850 | $bookkeeping->subledger_account = $k; |
851 | 851 | $bookkeeping->subledger_label = $tabcompany[$key]['name']; |
852 | - $accountingaccount->fetch(0, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
852 | + $accountingaccount->fetch(0, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
853 | 853 | $bookkeeping->numero_compte = $tabpay[$key]["account_various"]; |
854 | 854 | $bookkeeping->label_compte = $accountingaccount->label; |
855 | 855 | } elseif ($tabtype[$key] == 'banktransfert') { |
856 | 856 | $bookkeeping->subledger_account = ''; |
857 | 857 | $bookkeeping->subledger_label = ''; |
858 | - $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
858 | + $accountingaccount->fetch(0, $k, true); // TODO Use a cache |
|
859 | 859 | $bookkeeping->numero_compte = $k; |
860 | 860 | $bookkeeping->label_compte = $accountingaccount->label; |
861 | 861 | } else { |
@@ -886,7 +886,7 @@ discard block |
||
886 | 886 | } |
887 | 887 | } else { |
888 | 888 | if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) { |
889 | - require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php'; |
|
889 | + require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php'; |
|
890 | 890 | $lettering_static = new Lettering($db); |
891 | 891 | $nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id)); |
892 | 892 | } |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | 1 => $langs->trans("TransfertAllBankLines"), |
1148 | 1148 | 2 => $langs->trans("TransfertOnlyConciliatedBankLine") |
1149 | 1149 | ); |
1150 | - $moreoptions = [ "BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro)]; |
|
1150 | + $moreoptions = ["BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro)]; |
|
1151 | 1151 | |
1152 | 1152 | journalHead($nom, '', $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink, $moreoptions); |
1153 | 1153 | |
@@ -1307,7 +1307,7 @@ discard block |
||
1307 | 1307 | |
1308 | 1308 | // Label operation |
1309 | 1309 | print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">'; |
1310 | - print $reflabel; // This is already html escaped content |
|
1310 | + print $reflabel; // This is already html escaped content |
|
1311 | 1311 | print "</td>"; |
1312 | 1312 | |
1313 | 1313 | print '<td class="center">'.$val["type_payment"]."</td>"; |
@@ -1401,7 +1401,7 @@ discard block |
||
1401 | 1401 | } |
1402 | 1402 | } |
1403 | 1403 | print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">'; |
1404 | - print $accounttoshow; // This is a HTML string |
|
1404 | + print $accounttoshow; // This is a HTML string |
|
1405 | 1405 | print "</td>"; |
1406 | 1406 | |
1407 | 1407 | // Subledger account |
@@ -1429,12 +1429,12 @@ discard block |
||
1429 | 1429 | } |
1430 | 1430 | } |
1431 | 1431 | print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">'; |
1432 | - print $accounttoshowsubledger; // This is a html string |
|
1432 | + print $accounttoshowsubledger; // This is a html string |
|
1433 | 1433 | print "</td>"; |
1434 | 1434 | |
1435 | 1435 | // Label operation |
1436 | 1436 | print '<td class="nopaddingtopimpo paddingbottomimp">'; |
1437 | - print $reflabel; // This is a html string |
|
1437 | + print $reflabel; // This is a html string |
|
1438 | 1438 | print "</td>"; |
1439 | 1439 | |
1440 | 1440 | print '<td class="center">'.$val["type_payment"]."</td>"; |