@@ -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 |
@@ -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; |
@@ -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'); |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | $vals = array(); |
| 97 | 97 | $bool = false; |
| 98 | 98 | // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not) |
| 99 | - if ($num>0) { |
|
| 99 | + if ($num > 0) { |
|
| 100 | 100 | while ($row = $db->fetch_row($resql)) { |
| 101 | 101 | if (!isset($vals[$row[1]])) { |
| 102 | 102 | $vals[$row[1]] = 0; |
@@ -552,9 +552,9 @@ |
||
| 552 | 552 | while ($i < $nbofloop) { |
| 553 | 553 | $obj = $db->fetch_object($resql); |
| 554 | 554 | |
| 555 | - $fichinterstatic->id=$obj->rowid; |
|
| 556 | - $fichinterstatic->ref=$obj->ref; |
|
| 557 | - $fichinterstatic->statut=$obj->fk_statut; |
|
| 555 | + $fichinterstatic->id = $obj->rowid; |
|
| 556 | + $fichinterstatic->ref = $obj->ref; |
|
| 557 | + $fichinterstatic->statut = $obj->fk_statut; |
|
| 558 | 558 | |
| 559 | 559 | $companystatic->id = $obj->socid; |
| 560 | 560 | $companystatic->name = $obj->name; |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | /** |
| 154 | 154 | * @var int Thirdparty ID |
| 155 | 155 | */ |
| 156 | - public $socid; // both socid and fk_soc are used |
|
| 157 | - public $fk_soc; // both socid and fk_soc are used |
|
| 156 | + public $socid; // both socid and fk_soc are used |
|
| 157 | + public $fk_soc; // both socid and fk_soc are used |
|
| 158 | 158 | |
| 159 | 159 | /** |
| 160 | 160 | * @var int Status |
@@ -936,7 +936,7 @@ discard block |
||
| 936 | 936 | $this->date_creation = $this->db->jdate($obj->datec); |
| 937 | 937 | $this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem); |
| 938 | 938 | if (!empty($obj->datev)) { |
| 939 | - $this->date_validation = empty($obj->datev) ? '' : $this->db->jdate($obj->datev); |
|
| 939 | + $this->date_validation = empty($obj->datev) ? '' : $this->db->jdate($obj->datev); |
|
| 940 | 940 | } |
| 941 | 941 | } |
| 942 | 942 | |