@@ -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 | |
@@ -115,9 +115,9 @@ |
||
| 115 | 115 | |
| 116 | 116 | $now = dol_now(); |
| 117 | 117 | |
| 118 | -$title = $object->ref . ' - ' . $langs->trans("Notes"); |
|
| 118 | +$title = $object->ref.' - '.$langs->trans("Notes"); |
|
| 119 | 119 | if (!empty($withproject)) { |
| 120 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
| 120 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
| 121 | 121 | } |
| 122 | 122 | $help_url = ''; |
| 123 | 123 | |
@@ -121,9 +121,9 @@ |
||
| 121 | 121 | */ |
| 122 | 122 | $form = new Form($db); |
| 123 | 123 | |
| 124 | -$title = $object->ref . ' - ' . $langs->trans("Documents"); |
|
| 124 | +$title = $object->ref.' - '.$langs->trans("Documents"); |
|
| 125 | 125 | if (!empty($withproject)) { |
| 126 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
| 126 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
| 127 | 127 | } |
| 128 | 128 | $help_url = ''; |
| 129 | 129 | |
@@ -146,9 +146,9 @@ |
||
| 146 | 146 | $userstatic = new User($db); |
| 147 | 147 | $result = $projectstatic->fetch($object->fk_project); |
| 148 | 148 | |
| 149 | -$title = $object->ref . ' - ' . $langs->trans("Contacts"); |
|
| 149 | +$title = $object->ref.' - '.$langs->trans("Contacts"); |
|
| 150 | 150 | if (!empty($withproject)) { |
| 151 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
| 151 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
| 152 | 152 | } |
| 153 | 153 | $help_url = ''; |
| 154 | 154 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $actionType = 'delete'; |
| 63 | 63 | $n++; |
| 64 | 64 | $id = 'mybuttonid'.$n; |
| 65 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 65 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 66 | 66 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
| 67 | 67 | |
| 68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $actionType = 'danger'; |
| 71 | 71 | $n++; |
| 72 | 72 | $id = 'mybuttonid'.$n; |
| 73 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 73 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 74 | 74 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
| 75 | 75 | |
| 76 | 76 | ?> |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $actionType = 'delete'; |
| 96 | 96 | $n++; |
| 97 | 97 | $id = 'mybuttonid'.$n; |
| 98 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 98 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 99 | 99 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
| 100 | 100 | |
| 101 | 101 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $actionType = 'danger'; |
| 104 | 104 | $n++; |
| 105 | 105 | $id = 'mybuttonid'.$n; |
| 106 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 106 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 107 | 107 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
| 108 | 108 | |
| 109 | 109 | ?> |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $actionType = 'delete'; |
| 135 | 135 | $n++; |
| 136 | 136 | $id = 'mybuttonid'.$n; |
| 137 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 137 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 138 | 138 | |
| 139 | 139 | $params = array( |
| 140 | 140 | 'confirm' => array( |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $actionType = 'delete'; |
| 174 | 174 | $n++; |
| 175 | 175 | $id = 'mybuttonid'.$n; |
| 176 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
| 176 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
| 177 | 177 | |
| 178 | 178 | $params = array( |
| 179 | 179 | 'confirm' => array( |
@@ -328,7 +328,7 @@ |
||
| 328 | 328 | |
| 329 | 329 | foreach ($arrayofvat[$key] as $k => $mt) { |
| 330 | 330 | if ($mt) { |
| 331 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
| 331 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
| 332 | 332 | $account_label = $accountingaccount->label; |
| 333 | 333 | |
| 334 | 334 | // get compte id and label |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $maxfilesizearray = getMaxFileSizeArray(); |
| 182 | 182 | $maxmin = $maxfilesizearray['maxmin']; |
| 183 | 183 | if ($maxmin > 0) { |
| 184 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 184 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 185 | 185 | } |
| 186 | 186 | $texte .= ' <input type="file" name="uploadfile">'; |
| 187 | 187 | $texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 279 | 279 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 280 | 280 | |
| 281 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 281 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 282 | 282 | |
| 283 | 283 | // Get extension (ods or odt) |
| 284 | 284 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | if ($format == '1') { |
| 288 | 288 | $format = '%Y%m%d%H%M%S'; |
| 289 | 289 | } |
| 290 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 290 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 291 | 291 | } else { |
| 292 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 292 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 293 | 293 | } |
| 294 | - $file = $dir . '/' . $filename; |
|
| 294 | + $file = $dir.'/'.$filename; |
|
| 295 | 295 | //print "newdir=".$dir; |
| 296 | 296 | //print "newfile=".$newfile; |
| 297 | 297 | //print "file=".$file; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | dol_mkdir($conf->product->dir_temp); |
| 301 | 301 | if (!is_writable($conf->product->dir_temp)) { |
| 302 | 302 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp); |
| 303 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 303 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 304 | 304 | return -1; |
| 305 | 305 | } |
| 306 | 306 | |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 298 | 298 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 299 | 299 | |
| 300 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 300 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 301 | 301 | |
| 302 | 302 | // Get extension (ods or odt) |
| 303 | 303 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -306,11 +306,11 @@ discard block |
||
| 306 | 306 | if ($format == '1') { |
| 307 | 307 | $format = '%Y%m%d%H%M%S'; |
| 308 | 308 | } |
| 309 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 309 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 310 | 310 | } else { |
| 311 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 311 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 312 | 312 | } |
| 313 | - $file = $dir . '/' . $filename; |
|
| 313 | + $file = $dir.'/'.$filename; |
|
| 314 | 314 | //print "newdir=".$dir; |
| 315 | 315 | //print "newfile=".$newfile; |
| 316 | 316 | //print "file=".$file; |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | dol_mkdir($conf->supplier_proposal->dir_temp); |
| 320 | 320 | if (!is_writable($conf->supplier_proposal->dir_temp)) { |
| 321 | 321 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->supplier_proposal->dir_temp); |
| 322 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 322 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 323 | 323 | return -1; |
| 324 | 324 | } |
| 325 | 325 | |