@@ -615,7 +615,7 @@ |
||
| 615 | 615 | |
| 616 | 616 | $ref = dol_sanitizeFileName($newref); |
| 617 | 617 | $pdf_path = $dir_output."/".$ref.".pdf"; |
| 618 | - if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) { |
|
| 618 | + if (!dol_is_file($pdf_path) || (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) { |
|
| 619 | 619 | // We can't add PDF as it is not generated yet. |
| 620 | 620 | $filepdf = ''; |
| 621 | 621 | } else { |
@@ -214,8 +214,8 @@ |
||
| 214 | 214 | // Total debit-credit |
| 215 | 215 | print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>"; |
| 216 | 216 | for ($annee = $year_start; $annee <= $year_end; $annee++) { |
| 217 | - print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>'; |
|
| 218 | - print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>'; |
|
| 217 | + print '<td class="right nowraponall"><b>'.(isset($totsorties[$annee]) ? price($totsorties[$annee]) : '').'</b></td>'; |
|
| 218 | + print '<td class="right nowraponall"><b>'.(isset($totentrees[$annee]) ? price($totentrees[$annee]) : '').'</b></td>'; |
|
| 219 | 219 | } |
| 220 | 220 | print "</tr>\n"; |
| 221 | 221 | |
@@ -76,13 +76,13 @@ |
||
| 76 | 76 | * Boolean that indicates whether the product is available for sale '1' or not '0' |
| 77 | 77 | * @var int |
| 78 | 78 | */ |
| 79 | - public $product_tosell=0; |
|
| 79 | + public $product_tosell = 0; |
|
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * Boolean that indicates whether the product is available for purchase '1' or not '0' |
| 83 | 83 | * @var int |
| 84 | 84 | */ |
| 85 | - public $product_tobuy=0; |
|
| 85 | + public $product_tobuy = 0; |
|
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * Product description |
@@ -314,7 +314,9 @@ |
||
| 314 | 314 | } |
| 315 | 315 | // Now loop on each link of record in bank (code similar to bankentries_list.php) |
| 316 | 316 | foreach ($links as $key => $val) { |
| 317 | - if ($links[$key]['type'] == 'user' && !$is_sc) continue; |
|
| 317 | + if ($links[$key]['type'] == 'user' && !$is_sc) { |
|
| 318 | + continue; |
|
| 319 | + } |
|
| 318 | 320 | if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) { |
| 319 | 321 | // So we excluded 'company' and 'user' here. We want only payment lines |
| 320 | 322 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'"; |
| 140 | 140 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid"; |
| 141 | 141 | if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) { |
| 142 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 142 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 143 | 143 | } |
| 144 | 144 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid"; |
| 145 | 145 | $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal); |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | // Line into bank account |
| 621 | 621 | foreach ($tabbq[$key] as $k => $mt) { |
| 622 | 622 | if ($mt) { |
| 623 | - $accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch |
|
| 623 | + $accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch |
|
| 624 | 624 | $account_label = $accountingaccount->label; |
| 625 | 625 | |
| 626 | 626 | $reflabel = ''; |
@@ -736,43 +736,43 @@ discard block |
||
| 736 | 736 | } elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) { // If payment is payment of social contribution |
| 737 | 737 | $bookkeeping->subledger_account = ''; |
| 738 | 738 | $bookkeeping->subledger_label = ''; |
| 739 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 739 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 740 | 740 | $bookkeeping->numero_compte = $k; |
| 741 | 741 | $bookkeeping->label_compte = $accountingaccount->label; |
| 742 | 742 | } elseif ($tabtype[$key] == 'payment_vat') { |
| 743 | 743 | $bookkeeping->subledger_account = ''; |
| 744 | 744 | $bookkeeping->subledger_label = ''; |
| 745 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 745 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 746 | 746 | $bookkeeping->numero_compte = $k; |
| 747 | 747 | $bookkeeping->label_compte = $accountingaccount->label; |
| 748 | 748 | } elseif ($tabtype[$key] == 'payment_donation') { |
| 749 | 749 | $bookkeeping->subledger_account = ''; |
| 750 | 750 | $bookkeeping->subledger_label = ''; |
| 751 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 751 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 752 | 752 | $bookkeeping->numero_compte = $k; |
| 753 | 753 | $bookkeeping->label_compte = $accountingaccount->label; |
| 754 | 754 | } elseif ($tabtype[$key] == 'member') { |
| 755 | 755 | $bookkeeping->subledger_account = ''; |
| 756 | 756 | $bookkeeping->subledger_label = ''; |
| 757 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 757 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 758 | 758 | $bookkeeping->numero_compte = $k; |
| 759 | 759 | $bookkeeping->label_compte = $accountingaccount->label; |
| 760 | 760 | } elseif ($tabtype[$key] == 'payment_loan') { |
| 761 | 761 | $bookkeeping->subledger_account = ''; |
| 762 | 762 | $bookkeeping->subledger_label = ''; |
| 763 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 763 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 764 | 764 | $bookkeeping->numero_compte = $k; |
| 765 | 765 | $bookkeeping->label_compte = $accountingaccount->label; |
| 766 | 766 | } elseif ($tabtype[$key] == 'payment_various') { |
| 767 | 767 | $bookkeeping->subledger_account = $k; |
| 768 | 768 | $bookkeeping->subledger_label = $tabcompany[$key]['name']; |
| 769 | - $accountingaccount->fetch(null, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
| 769 | + $accountingaccount->fetch(null, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
| 770 | 770 | $bookkeeping->numero_compte = $tabpay[$key]["account_various"]; |
| 771 | 771 | $bookkeeping->label_compte = $accountingaccount->label; |
| 772 | 772 | } elseif ($tabtype[$key] == 'banktransfert') { |
| 773 | 773 | $bookkeeping->subledger_account = ''; |
| 774 | 774 | $bookkeeping->subledger_label = ''; |
| 775 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 775 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
| 776 | 776 | $bookkeeping->numero_compte = $k; |
| 777 | 777 | $bookkeeping->label_compte = $accountingaccount->label; |
| 778 | 778 | } else { |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | } |
| 804 | 804 | } else { |
| 805 | 805 | if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) { |
| 806 | - require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php'; |
|
| 806 | + require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php'; |
|
| 807 | 807 | $lettering_static = new Lettering($db); |
| 808 | 808 | $nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id)); |
| 809 | 809 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | |
| 1200 | 1200 | // Label operation |
| 1201 | 1201 | print '<td>'; |
| 1202 | - print $reflabel; // This is already html escaped content |
|
| 1202 | + print $reflabel; // This is already html escaped content |
|
| 1203 | 1203 | print "</td>"; |
| 1204 | 1204 | |
| 1205 | 1205 | print '<td class="center">'.$val["type_payment"]."</td>"; |
@@ -1292,7 +1292,7 @@ discard block |
||
| 1292 | 1292 | } |
| 1293 | 1293 | } |
| 1294 | 1294 | print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">'; |
| 1295 | - print $accounttoshow; // This is a HTML string |
|
| 1295 | + print $accounttoshow; // This is a HTML string |
|
| 1296 | 1296 | print "</td>"; |
| 1297 | 1297 | |
| 1298 | 1298 | // Subledger account |
@@ -1321,7 +1321,7 @@ discard block |
||
| 1321 | 1321 | } |
| 1322 | 1322 | } |
| 1323 | 1323 | print '<td class="maxwidth300">'; |
| 1324 | - print $accounttoshowsubledger; // This is a html string |
|
| 1324 | + print $accounttoshowsubledger; // This is a html string |
|
| 1325 | 1325 | print "</td>"; |
| 1326 | 1326 | |
| 1327 | 1327 | print "<td>".$reflabel."</td>"; |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | $maxfilesizearray = getMaxFileSizeArray(); |
| 114 | 114 | $maxmin = $maxfilesizearray['maxmin']; |
| 115 | 115 | if ($maxmin > 0) { |
| 116 | - $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 116 | + $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 117 | 117 | } |
| 118 | 118 | $s .= '<input type="file" name="username" class="flat">'; |
| 119 | 119 | return $s; |
@@ -154,7 +154,7 @@ |
||
| 154 | 154 | $maxphptoshow = $maxfilesizearray['maxphptoshow']; |
| 155 | 155 | $maxphptoshowparam = $maxfilesizearray['maxphptoshowparam']; |
| 156 | 156 | if ($maxmin > 0) { |
| 157 | - $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 157 | + $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 158 | 158 | } |
| 159 | 159 | $out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"'; |
| 160 | 160 | $out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple'); |
@@ -315,14 +315,14 @@ discard block |
||
| 315 | 315 | $importcsv = new ImportCsv($db, 'massstocklist'); |
| 316 | 316 | //print $importcsv->separator; |
| 317 | 317 | |
| 318 | - $nblinesrecord = $importcsv->import_get_nb_of_lines($fullpath)-1; |
|
| 318 | + $nblinesrecord = $importcsv->import_get_nb_of_lines($fullpath) - 1; |
|
| 319 | 319 | $importcsv->import_open_file($fullpath); |
| 320 | 320 | $labelsrecord = $importcsv->import_read_record(); |
| 321 | 321 | |
| 322 | 322 | if ($nblinesrecord < 1) { |
| 323 | 323 | setEventMessages($langs->trans("BadNumberOfLinesMustHaveAtLeastOneLinePlusTitle"), null, 'errors'); |
| 324 | 324 | } else { |
| 325 | - $i=0; |
|
| 325 | + $i = 0; |
|
| 326 | 326 | $data = array(); |
| 327 | 327 | $productstatic = new Product($db); |
| 328 | 328 | $warehousestatics = new Entrepot($db); |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | $maxfilesizearray = getMaxFileSizeArray(); |
| 485 | 485 | $maxmin = $maxfilesizearray['maxmin']; |
| 486 | 486 | if ($maxmin > 0) { |
| 487 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 487 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 488 | 488 | } |
| 489 | 489 | print '<input type="file" name="userfile" size="20" maxlength="80"> '; |
| 490 | 490 | $out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : ''); |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | /** |
| 102 | 102 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 103 | 103 | */ |
| 104 | - public $fields=array( |
|
| 104 | + public $fields = array( |
|
| 105 | 105 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
| 106 | 106 | 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"), |
| 107 | 107 | 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',), |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
| 59 | 59 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
| 60 | 60 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
| 61 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 61 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 62 | 62 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 63 | 63 | $search_date_limit_startday = GETPOST('search_date_limit_startday', 'int'); |
| 64 | 64 | $search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int'); |