@@ -91,7 +91,7 @@ |
||
| 91 | 91 | |
| 92 | 92 | // Object card |
| 93 | 93 | // ------------------------------------------------------------ |
| 94 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 94 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | $morehtmlref = '<div class="refidno">'; |
| 97 | 97 | $morehtmlref .= '</div>'; |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? |
| 38 | 38 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
| 39 | 39 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
| 40 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 40 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 41 | 41 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetmodellist'; // To manage different context of search |
| 42 | 42 | $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
| 43 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
| 43 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
| 44 | 44 | |
| 45 | 45 | $id = GETPOST('id', 'int'); |
| 46 | 46 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | // Default sort order (if not yet defined by previous GETPOST) |
| 72 | 72 | if (!$sortfield) { |
| 73 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 73 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 74 | 74 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
| 75 | 75 | } |
| 76 | 76 | if (!$sortorder) { |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
| 255 | 255 | } |
| 256 | 256 | if (preg_match('/_dtend$/', $key)) { |
| 257 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
| 257 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /** |
| 101 | 101 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 102 | 102 | */ |
| 103 | - public $fields=array( |
|
| 103 | + public $fields = array( |
|
| 104 | 104 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
| 105 | 105 | 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1'), |
| 106 | 106 | 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',), |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | |
| 447 | 447 | // Protection |
| 448 | 448 | if ($this->status == self::STATUS_VALIDATED) { |
| 449 | - dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING); |
|
| 449 | + dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING); |
|
| 450 | 450 | return 0; |
| 451 | 451 | } |
| 452 | 452 | |
@@ -455,17 +455,17 @@ discard block |
||
| 455 | 455 | $this->db->begin(); |
| 456 | 456 | |
| 457 | 457 | // Validate |
| 458 | - $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element; |
|
| 459 | - $sql .= " SET status = " . self::STATUS_VALIDATED; |
|
| 458 | + $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; |
|
| 459 | + $sql .= " SET status = ".self::STATUS_VALIDATED; |
|
| 460 | 460 | if (!empty($this->fields['date_validation'])) { |
| 461 | - $sql .= ", date_validation = '" . $this->db->idate($now) . "'"; |
|
| 461 | + $sql .= ", date_validation = '".$this->db->idate($now)."'"; |
|
| 462 | 462 | } |
| 463 | 463 | if (!empty($this->fields['fk_user_valid'])) { |
| 464 | - $sql .= ", fk_user_valid = " . ((int) $user->id); |
|
| 464 | + $sql .= ", fk_user_valid = ".((int) $user->id); |
|
| 465 | 465 | } |
| 466 | - $sql .= " WHERE rowid = " . ((int) $this->id); |
|
| 466 | + $sql .= " WHERE rowid = ".((int) $this->id); |
|
| 467 | 467 | |
| 468 | - dol_syslog(get_class($this) . "::validate()", LOG_DEBUG); |
|
| 468 | + dol_syslog(get_class($this)."::validate()", LOG_DEBUG); |
|
| 469 | 469 | $resql = $this->db->query($sql); |
| 470 | 470 | if (!$resql) { |
| 471 | 471 | dol_print_error($this->db); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | if (!is_object($formadmin)) { |
| 38 | - require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; |
|
| 38 | + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; |
|
| 39 | 39 | $formadmin = new FormAdmin($db); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -69,19 +69,19 @@ discard block |
||
| 69 | 69 | 'mode_key' => $info[0], |
| 70 | 70 | 'field_key' => $info[1], |
| 71 | 71 | 'value' => $info[2], |
| 72 | - 'target' => 'block_' . $mode_key, |
|
| 72 | + 'target' => 'block_'.$mode_key, |
|
| 73 | 73 | ); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true); |
| 77 | - $prefix_html_name = $mode_key . '_'; |
|
| 77 | + $prefix_html_name = $mode_key.'_'; |
|
| 78 | 78 | |
| 79 | - print '<div id="block_' . $mode_key . '">'; |
|
| 79 | + print '<div id="block_'.$mode_key.'">'; |
|
| 80 | 80 | print load_fiche_titre($langs->trans($mode_info['label']), '', ''); |
| 81 | 81 | print '<div class="fichecenter">'; |
| 82 | 82 | print '<div class="fichehalfleft">'; |
| 83 | 83 | print '<div class="underbanner clearboth"></div>'; |
| 84 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 84 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 85 | 85 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 86 | 86 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 87 | 87 | // Discard if extrafield is a hidden field on form |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | print '<table class="border centpercent tableforfield">'; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $html_name = $prefix_html_name . $field_key; |
|
| 105 | + $html_name = $prefix_html_name.$field_key; |
|
| 106 | 106 | if (!empty($field_info['enabled_field'])) { |
| 107 | 107 | $info = explode(':', $field_info['enabled_field']); |
| 108 | 108 | $enabled_field_info[] = array( |
| 109 | 109 | 'mode_key' => $info[0], |
| 110 | 110 | 'field_key' => $info[1], |
| 111 | 111 | 'value' => $info[2], |
| 112 | - 'target' => 'field_' . $html_name, |
|
| 112 | + 'target' => 'field_'.$html_name, |
|
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | $more_class .= ' tdtop'; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td'; |
|
| 125 | - print ' class="titlefieldcreate' . $more_class . '">'; |
|
| 124 | + print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td'; |
|
| 125 | + print ' class="titlefieldcreate'.$more_class.'">'; |
|
| 126 | 126 | if (!empty($field_info['help'])) { |
| 127 | 127 | print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help'])); |
| 128 | 128 | } else { |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | } |
| 222 | 222 | }); |
| 223 | 223 | </script> |
| 224 | -SCRIPT; |
|
| 224 | +script; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | ?> |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '<div class="fichecenter">'; |
| 68 | 68 | print '<div class="fichehalfleft">'; |
| 69 | 69 | print '<div class="underbanner clearboth"></div>'; |
| 70 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 70 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 71 | 71 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 72 | 72 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 73 | 73 | if (!empty($field_info['enabled_field'])) { |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | print '<table class="border centpercent tableforfield">'; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $key = $mode_key . '_' . $field_key; |
|
| 97 | + $key = $mode_key.'_'.$field_key; |
|
| 98 | 98 | $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key]; |
| 99 | 99 | |
| 100 | - print '<tr class="field_' . $key . '"><td'; |
|
| 101 | - print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key; |
|
| 100 | + print '<tr class="field_'.$key.'"><td'; |
|
| 101 | + print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key; |
|
| 102 | 102 | if ($field_info['type'] == 'text' || $field_info['type'] == 'html') { |
| 103 | 103 | print ' tdtop'; |
| 104 | 104 | } |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | print '</td>'; |
| 116 | - print '<td class="valuefield fieldname_' . $key; |
|
| 116 | + print '<td class="valuefield fieldname_'.$key; |
|
| 117 | 117 | if ($field_info['type'] == 'text') { |
| 118 | 118 | print ' wordbreak'; |
| 119 | 119 | } |
| 120 | 120 | if (!empty($field_info['cssview'])) { |
| 121 | - print ' ' . $field_info['cssview']; |
|
| 121 | + print ' '.$field_info['cssview']; |
|
| 122 | 122 | } |
| 123 | 123 | print '">'; |
| 124 | 124 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | if ($field_key == 'lang') { |
| 128 | 128 | $langs->load("languages"); |
| 129 | - $labellang = ($value ? $langs->trans('Language_' . $value) : ''); |
|
| 129 | + $labellang = ($value ? $langs->trans('Language_'.$value) : ''); |
|
| 130 | 130 | print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"'); |
| 131 | 131 | print $labellang; |
| 132 | 132 | } else { |
| 133 | 133 | if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) { |
| 134 | - $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 134 | + $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 135 | 135 | print showValueWithClipboardCPButton($out, 0, $out); |
| 136 | 136 | } else { |
| 137 | - print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 137 | + print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '<div class="fichecenter">'; |
| 68 | 68 | print '<div class="fichehalfleft">'; |
| 69 | 69 | print '<div class="underbanner clearboth"></div>'; |
| 70 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 70 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 71 | 71 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 72 | 72 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 73 | 73 | if (!empty($field_info['enabled_field'])) { |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | print '<table class="border centpercent tableforfield">'; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $key = $mode_key . '_' . $field_key; |
|
| 97 | + $key = $mode_key.'_'.$field_key; |
|
| 98 | 98 | $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key]; |
| 99 | 99 | |
| 100 | - print '<tr class="field_' . $key . '"><td'; |
|
| 101 | - print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key; |
|
| 100 | + print '<tr class="field_'.$key.'"><td'; |
|
| 101 | + print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key; |
|
| 102 | 102 | if ($field_info['type'] == 'text' || $field_info['type'] == 'html') { |
| 103 | 103 | print ' tdtop'; |
| 104 | 104 | } |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | print '</td>'; |
| 116 | - print '<td class="valuefield fieldname_' . $key; |
|
| 116 | + print '<td class="valuefield fieldname_'.$key; |
|
| 117 | 117 | if ($field_info['type'] == 'text') { |
| 118 | 118 | print ' wordbreak'; |
| 119 | 119 | } |
| 120 | 120 | if (!empty($field_info['cssview'])) { |
| 121 | - print ' ' . $field_info['cssview']; |
|
| 121 | + print ' '.$field_info['cssview']; |
|
| 122 | 122 | } |
| 123 | 123 | print '">'; |
| 124 | 124 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | if ($field_key == 'lang') { |
| 128 | 128 | $langs->load("languages"); |
| 129 | - $labellang = ($value ? $langs->trans('Language_' . $value) : ''); |
|
| 129 | + $labellang = ($value ? $langs->trans('Language_'.$value) : ''); |
|
| 130 | 130 | print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"'); |
| 131 | 131 | print $labellang; |
| 132 | 132 | } else { |
| 133 | 133 | if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) { |
| 134 | - $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 134 | + $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 135 | 135 | print showValueWithClipboardCPButton($out, 0, $out); |
| 136 | 136 | } else { |
| 137 | - print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 137 | + print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $amount = $credit; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - return "'" . $this->db->escape(abs($amount)) . "'"; |
|
| 109 | + return "'".$this->db->escape(abs($amount))."'"; |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | return "''"; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $sens = 'C'; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - return "'" . $this->db->escape($sens) . "'"; |
|
| 137 | + return "'".$this->db->escape($sens)."'"; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | return "''"; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | case 'sellist': |
| 49 | 49 | $tmp = ''; |
| 50 | 50 | $tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null |
| 51 | - if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 51 | + if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 52 | 52 | $tmpkeys = array_keys($tmpparam['options']); |
| 53 | 53 | $tmp = array_shift($tmpkeys); |
| 54 | 54 | } |
@@ -353,7 +353,7 @@ |
||
| 353 | 353 | 'b.montant'=>'rule-computeAmount', |
| 354 | 354 | 'b.sens'=>'rule-computeDirection' |
| 355 | 355 | ); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) |
| 356 | - $this->import_convertvalue_array[$r]=array( |
|
| 356 | + $this->import_convertvalue_array[$r] = array( |
|
| 357 | 357 | 'b.piece_num' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'), |
| 358 | 358 | 'b.numero_compte'=>array('rule'=>'accountingaccount'), |
| 359 | 359 | 'b.subledger_account'=>array('rule'=>'accountingaccount'), |