@@ -1029,7 +1029,7 @@ discard block |
||
1029 | 1029 | 'start' => isset($value['start']) ? $value['start'] : '', |
1030 | 1030 | 'end' => isset($value['end']) ? $value['end'] : '' |
1031 | 1031 | ); |
1032 | - $out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">'; |
|
1032 | + $out = '<div '.($moreparam ? $moreparam : '').'><div class="nowrap">'; |
|
1033 | 1033 | $out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From")); |
1034 | 1034 | $out .= '</div><div class="nowrap">'; |
1035 | 1035 | $out .= $form->selectDate($prefill['end'], $keyprefix.$key.$keysuffix.'_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to")); |
@@ -1054,7 +1054,7 @@ discard block |
||
1054 | 1054 | 'start' => isset($value['start']) ? $value['start'] : '', |
1055 | 1055 | 'end' => isset($value['end']) ? $value['end'] : '' |
1056 | 1056 | ); |
1057 | - $out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">'; |
|
1057 | + $out = '<div '.($moreparam ? $moreparam : '').'><div class="nowrap">'; |
|
1058 | 1058 | $out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 1, 1, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"), 'tzuserrel'); |
1059 | 1059 | $out .= '</div><div class="nowrap">'; |
1060 | 1060 | $out .= $form->selectDate($prefill['end'], $keyprefix.$key.$keysuffix.'_end', 1, 1, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"), 'tzuserrel'); |
@@ -1077,24 +1077,24 @@ discard block |
||
1077 | 1077 | $out ='<link rel="stylesheet" href="'.dol_buildpath('/myfield/css/fontawesome-iconpicker.min.css', 1).'">'; |
1078 | 1078 | $out.='<script src="'.dol_buildpath('/myfield/js/fontawesome-iconpicker.min.js', 1).'"></script>'; |
1079 | 1079 | */ |
1080 | - $out.= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"'; |
|
1081 | - $out.= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>'; |
|
1080 | + $out .= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"'; |
|
1081 | + $out .= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>'; |
|
1082 | 1082 | if (getDolGlobalInt('MAIN_ADD_ICONPICKER_JS')) { |
1083 | - $out.='<script>'; |
|
1084 | - $options="{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {"; |
|
1085 | - $options.="iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',"; |
|
1086 | - $options.="iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',"; |
|
1083 | + $out .= '<script>'; |
|
1084 | + $options = "{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {"; |
|
1085 | + $options .= "iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',"; |
|
1086 | + $options .= "iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',"; |
|
1087 | 1087 | // $options.="buttons: '<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-cancel btn btn-default btn-sm\">".$langs->trans("Cancel")."</button>"; |
1088 | 1088 | // $options.="<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-accept btn btn-primary btn-sm\">".$langs->trans("Save")."</button>',"; |
1089 | - $options.="footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',"; |
|
1090 | - $options.="search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',"; |
|
1091 | - $options.="popover: '<div class=\"iconpicker-popover popover\">"; |
|
1092 | - $options.=" <div class=\"arrow\" ></div>"; |
|
1093 | - $options.=" <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>"; |
|
1094 | - $options.=" <div class=\"popover-content \" ></div>"; |
|
1095 | - $options.="</div>'}}"; |
|
1096 | - $out.="$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");"; |
|
1097 | - $out.='</script>'; |
|
1089 | + $options .= "footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',"; |
|
1090 | + $options .= "search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',"; |
|
1091 | + $options .= "popover: '<div class=\"iconpicker-popover popover\">"; |
|
1092 | + $options .= " <div class=\"arrow\" ></div>"; |
|
1093 | + $options .= " <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>"; |
|
1094 | + $options .= " <div class=\"popover-content \" ></div>"; |
|
1095 | + $options .= "</div>'}}"; |
|
1096 | + $out .= "$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");"; |
|
1097 | + $out .= '</script>'; |
|
1098 | 1098 | } |
1099 | 1099 | } elseif ($type == 'text') { |
1100 | 1100 | if (!preg_match('/search_/', $keyprefix)) { // If keyprefix is search_ or search_options_, we must just use a simple text field |
@@ -1592,10 +1592,10 @@ discard block |
||
1592 | 1592 | |
1593 | 1593 | $tmparray = explode(':', $param_list[0]); |
1594 | 1594 | |
1595 | - $element = $extrafieldsobjectkey; // $extrafieldsobjectkey comes from $object->table_element but we need $object->element |
|
1595 | + $element = $extrafieldsobjectkey; // $extrafieldsobjectkey comes from $object->table_element but we need $object->element |
|
1596 | 1596 | if ($element == 'socpeople') { |
1597 | 1597 | $element = 'contact'; |
1598 | - } else if ( $element == 'projet' ) { |
|
1598 | + } else if ($element == 'projet') { |
|
1599 | 1599 | $element = 'project'; |
1600 | 1600 | } |
1601 | 1601 | |
@@ -1640,7 +1640,7 @@ discard block |
||
1640 | 1640 | |
1641 | 1641 | $label = $this->attributes[$extrafieldsobjectkey]['label'][$key]; |
1642 | 1642 | $type = $this->attributes[$extrafieldsobjectkey]['type'][$key]; |
1643 | - $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'... |
|
1643 | + $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'... |
|
1644 | 1644 | $default = $this->attributes[$extrafieldsobjectkey]['default'][$key]; |
1645 | 1645 | $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key]; |
1646 | 1646 | $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key]; |
@@ -1662,7 +1662,7 @@ discard block |
||
1662 | 1662 | if ($type == 'date') { |
1663 | 1663 | $showsize = 10; |
1664 | 1664 | if ($value !== '') { |
1665 | - $value = dol_print_date($value, 'day'); // For date without hour, date is always GMT for storage and output |
|
1665 | + $value = dol_print_date($value, 'day'); // For date without hour, date is always GMT for storage and output |
|
1666 | 1666 | } |
1667 | 1667 | } elseif ($type == 'datetime') { |
1668 | 1668 | $showsize = 19; |
@@ -1806,13 +1806,13 @@ discard block |
||
1806 | 1806 | $toprint = array(); |
1807 | 1807 | $obj = $this->db->fetch_object($resql); |
1808 | 1808 | if ($obj->rowid) { |
1809 | - require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; |
|
1809 | + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; |
|
1810 | 1810 | $c = new Categorie($this->db); |
1811 | 1811 | $result = $c->fetch($obj->rowid); |
1812 | 1812 | if ($result > 0) { |
1813 | 1813 | $ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text |
1814 | 1814 | foreach ($ways as $way) { |
1815 | - $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . img_object('', 'category') . ' ' . $way . '</li>'; |
|
1815 | + $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.img_object('', 'category').' '.$way.'</li>'; |
|
1816 | 1816 | } |
1817 | 1817 | } |
1818 | 1818 | } |
@@ -2026,13 +2026,13 @@ discard block |
||
2026 | 2026 | { |
2027 | 2027 | global $conf, $langs; |
2028 | 2028 | |
2029 | - $tagtype='tr'; |
|
2030 | - $tagtype_dyn='td'; |
|
2029 | + $tagtype = 'tr'; |
|
2030 | + $tagtype_dyn = 'td'; |
|
2031 | 2031 | |
2032 | - if ($display_type=='line') { |
|
2033 | - $tagtype='div'; |
|
2034 | - $tagtype_dyn='span'; |
|
2035 | - $colspan=0; |
|
2032 | + if ($display_type == 'line') { |
|
2033 | + $tagtype = 'div'; |
|
2034 | + $tagtype_dyn = 'span'; |
|
2035 | + $colspan = 0; |
|
2036 | 2036 | } |
2037 | 2037 | |
2038 | 2038 | $extrafield_param = $this->attributes[$object->table_element]['param'][$key]; |
@@ -2052,12 +2052,12 @@ discard block |
||
2052 | 2052 | if ($mode == 'create') { |
2053 | 2053 | // On create mode, force separator group to not be collapsable |
2054 | 2054 | $extrafield_collapse_display_value = 1; |
2055 | - $expand_display = true; // We force group to be shown expanded |
|
2055 | + $expand_display = true; // We force group to be shown expanded |
|
2056 | 2056 | $disabledcookiewrite = 1; // We keep status of group unchanged into the cookie |
2057 | 2057 | } |
2058 | 2058 | |
2059 | 2059 | $out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'">'; |
2060 | - $out .= '<'.$tagtype_dyn.' '.(!empty($colspan) ? 'colspan="' . $colspan . '"' : '').'>'; |
|
2060 | + $out .= '<'.$tagtype_dyn.' '.(!empty($colspan) ? 'colspan="'.$colspan.'"' : '').'>'; |
|
2061 | 2061 | // Some js code will be injected here to manage the collapsing of extrafields |
2062 | 2062 | // Output the picto |
2063 | 2063 | $out .= '<span class="'.($extrafield_collapse_display_value ? 'cursorpointer ' : '').($extrafield_collapse_display_value == 0 ? 'fas fa-square opacitymedium' : 'far fa-'.(($expand_display ? 'minus' : 'plus').'-square')).'"></span>'; |
@@ -2139,7 +2139,7 @@ discard block |
||
2139 | 2139 | continue; |
2140 | 2140 | } |
2141 | 2141 | |
2142 | - if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) { |
|
2142 | + if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (!in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) { |
|
2143 | 2143 | //when unticking boolean field, it's not set in POST |
2144 | 2144 | continue; |
2145 | 2145 | } |
@@ -2168,7 +2168,7 @@ discard block |
||
2168 | 2168 | $onlykey === '@GETPOSTISSET' |
2169 | 2169 | && in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')) |
2170 | 2170 | && in_array(abs($enabled), array(2, 5)) |
2171 | - && ! GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided |
|
2171 | + && !GETPOSTISSET('options_'.$key) // Update hidden checkboxes and multiselect only if they are provided |
|
2172 | 2172 | ) |
2173 | 2173 | ) { |
2174 | 2174 | continue; |
@@ -2295,16 +2295,16 @@ discard block |
||
2295 | 2295 | } |
2296 | 2296 | |
2297 | 2297 | if (in_array($key_type, array('date'))) { |
2298 | - $dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start'; |
|
2299 | - $dateparamname_end = $keysuffix . 'options_' . $key . $keyprefix . '_end'; |
|
2300 | - if (GETPOST($dateparamname_start . 'year') || GETPOST($dateparamname_end . 'year')) { |
|
2298 | + $dateparamname_start = $keysuffix.'options_'.$key.$keyprefix.'_start'; |
|
2299 | + $dateparamname_end = $keysuffix.'options_'.$key.$keyprefix.'_end'; |
|
2300 | + if (GETPOST($dateparamname_start.'year') || GETPOST($dateparamname_end.'year')) { |
|
2301 | 2301 | $value_key = array(); |
2302 | 2302 | // values provided as a component year, month, day, etc. |
2303 | - if (GETPOST($dateparamname_start . 'year')) { |
|
2304 | - $value_key['start'] = dol_mktime(0, 0, 0, GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int')); |
|
2303 | + if (GETPOST($dateparamname_start.'year')) { |
|
2304 | + $value_key['start'] = dol_mktime(0, 0, 0, GETPOST($dateparamname_start.'month', 'int'), GETPOST($dateparamname_start.'day', 'int'), GETPOST($dateparamname_start.'year', 'int')); |
|
2305 | 2305 | } |
2306 | - if (GETPOST($dateparamname_start . 'year')) { |
|
2307 | - $value_key['end'] = dol_mktime(23, 59, 59, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int')); |
|
2306 | + if (GETPOST($dateparamname_start.'year')) { |
|
2307 | + $value_key['end'] = dol_mktime(23, 59, 59, GETPOST($dateparamname_end.'month', 'int'), GETPOST($dateparamname_end.'day', 'int'), GETPOST($dateparamname_end.'year', 'int')); |
|
2308 | 2308 | } |
2309 | 2309 | } elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) { |
2310 | 2310 | // Clean parameters |
@@ -2313,22 +2313,22 @@ discard block |
||
2313 | 2313 | continue; // Value was not provided, we should not set it. |
2314 | 2314 | } |
2315 | 2315 | } elseif (in_array($key_type, array('datetime', 'datetimegmt'))) { |
2316 | - $dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start'; |
|
2317 | - $dateparamname_end = $keysuffix . 'options_' . $key . $keyprefix . '_end'; |
|
2318 | - if (GETPOST($dateparamname_start . 'year') && GETPOST($dateparamname_end . 'year')) { |
|
2316 | + $dateparamname_start = $keysuffix.'options_'.$key.$keyprefix.'_start'; |
|
2317 | + $dateparamname_end = $keysuffix.'options_'.$key.$keyprefix.'_end'; |
|
2318 | + if (GETPOST($dateparamname_start.'year') && GETPOST($dateparamname_end.'year')) { |
|
2319 | 2319 | // values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc. |
2320 | - $dateparamname_end_hour = GETPOST($dateparamname_end . 'hour', 'int') != '-1' ? GETPOST($dateparamname_end . 'hour', 'int') : '23'; |
|
2321 | - $dateparamname_end_min = GETPOST($dateparamname_end . 'min', 'int') != '-1' ? GETPOST($dateparamname_end . 'min', 'int') : '59'; |
|
2322 | - $dateparamname_end_sec = GETPOST($dateparamname_end . 'sec', 'int') != '-1' ? GETPOST($dateparamname_end . 'sec', 'int') : '59'; |
|
2320 | + $dateparamname_end_hour = GETPOST($dateparamname_end.'hour', 'int') != '-1' ? GETPOST($dateparamname_end.'hour', 'int') : '23'; |
|
2321 | + $dateparamname_end_min = GETPOST($dateparamname_end.'min', 'int') != '-1' ? GETPOST($dateparamname_end.'min', 'int') : '59'; |
|
2322 | + $dateparamname_end_sec = GETPOST($dateparamname_end.'sec', 'int') != '-1' ? GETPOST($dateparamname_end.'sec', 'int') : '59'; |
|
2323 | 2323 | if ($key_type == 'datetimegmt') { |
2324 | 2324 | $value_key = array( |
2325 | - 'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'gmt'), |
|
2326 | - 'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'gmt') |
|
2325 | + 'start' => dol_mktime(GETPOST($dateparamname_start.'hour', 'int'), GETPOST($dateparamname_start.'min', 'int'), GETPOST($dateparamname_start.'sec', 'int'), GETPOST($dateparamname_start.'month', 'int'), GETPOST($dateparamname_start.'day', 'int'), GETPOST($dateparamname_start.'year', 'int'), 'gmt'), |
|
2326 | + 'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end.'month', 'int'), GETPOST($dateparamname_end.'day', 'int'), GETPOST($dateparamname_end.'year', 'int'), 'gmt') |
|
2327 | 2327 | ); |
2328 | 2328 | } else { |
2329 | 2329 | $value_key = array( |
2330 | - 'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'tzuserrel'), |
|
2331 | - 'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'tzuserrel') |
|
2330 | + 'start' => dol_mktime(GETPOST($dateparamname_start.'hour', 'int'), GETPOST($dateparamname_start.'min', 'int'), GETPOST($dateparamname_start.'sec', 'int'), GETPOST($dateparamname_start.'month', 'int'), GETPOST($dateparamname_start.'day', 'int'), GETPOST($dateparamname_start.'year', 'int'), 'tzuserrel'), |
|
2331 | + 'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end.'month', 'int'), GETPOST($dateparamname_end.'day', 'int'), GETPOST($dateparamname_end.'year', 'int'), 'tzuserrel') |
|
2332 | 2332 | ); |
2333 | 2333 | } |
2334 | 2334 | } elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) { |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | // Ajout |
292 | 292 | $companybankaccount = new CompanyBankAccount($db); |
293 | 293 | |
294 | - $companybankaccount->socid = $object->id; |
|
294 | + $companybankaccount->socid = $object->id; |
|
295 | 295 | |
296 | 296 | $companybankaccount->fetch_thirdparty(); |
297 | 297 | |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | } |
587 | 587 | if ($action == 'syncsepatostripe') { |
588 | 588 | // Create the bank account on current Stripe env |
589 | - $companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib |
|
589 | + $companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib |
|
590 | 590 | $companypaymentmode->fetch($id); |
591 | 591 | |
592 | 592 | if ($companypaymentmode->type != 'ban') { |
@@ -1180,7 +1180,7 @@ discard block |
||
1180 | 1180 | print '<table class="liste centpercent">'."\n"; |
1181 | 1181 | print '<tr class="liste_titre">'; |
1182 | 1182 | print '<td>'.$langs->trans('Label').'</td>'; |
1183 | - print '<td>'.$form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")).'</td>'; // external system ID |
|
1183 | + print '<td>'.$form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")).'</td>'; // external system ID |
|
1184 | 1184 | print '<td>'.$langs->trans('Type').'</td>'; |
1185 | 1185 | print '<td>'.$langs->trans('Informations').'</td>'; |
1186 | 1186 | print '<td></td>'; |
@@ -1520,7 +1520,7 @@ discard block |
||
1520 | 1520 | |
1521 | 1521 | // List of bank accounts |
1522 | 1522 | if ($permissiontoaddupdatepaymentinformation) { |
1523 | - $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&action=create'); |
|
1523 | + $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=create'); |
|
1524 | 1524 | } |
1525 | 1525 | |
1526 | 1526 | print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank'); |
@@ -1537,7 +1537,7 @@ discard block |
||
1537 | 1537 | |
1538 | 1538 | print '<tr class="liste_titre">'; |
1539 | 1539 | print_liste_field_titre("Label"); |
1540 | - print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID |
|
1540 | + print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID |
|
1541 | 1541 | print_liste_field_titre("Bank"); |
1542 | 1542 | print_liste_field_titre("RIB"); |
1543 | 1543 | print_liste_field_titre("IBAN"); |
@@ -1718,7 +1718,7 @@ discard block |
||
1718 | 1718 | print '<td class="right nowraponall">'; |
1719 | 1719 | $useonlinesignature = 1; |
1720 | 1720 | if ($useonlinesignature) { |
1721 | - require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php'; |
|
1721 | + require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php'; |
|
1722 | 1722 | print showOnlineSignatureUrl($companybankaccount->element, $rib->id, $rib); |
1723 | 1723 | } |
1724 | 1724 | print '</td>'; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | /** |
98 | 98 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
99 | 99 | */ |
100 | - public $fields=array( |
|
100 | + public $fields = array( |
|
101 | 101 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
102 | 102 | 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1), |
103 | 103 | 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'csslist'=>'nowraponall'), |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | 'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,), |
112 | 112 | 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,), |
113 | 113 | 'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'), |
114 | - 'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'), |
|
114 | + 'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp', 'label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'), |
|
115 | 115 | 'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'), |
116 | 116 | 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),), |
117 | 117 | ); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | /** |
135 | 135 | * @var string type |
136 | 136 | */ |
137 | - public $type; // HUMAN, MACHINE, ... |
|
137 | + public $type; // HUMAN, MACHINE, ... |
|
138 | 138 | |
139 | 139 | /** |
140 | 140 | * @var integer|string date_creation |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | // Usergroups |
502 | 502 | $groups = GETPOST('groups', 'array:int'); |
503 | 503 | WorkstationUserGroup::deleteAllGroupsOfWorkstation($this->id); |
504 | - $this->usergroups=array(); |
|
504 | + $this->usergroups = array(); |
|
505 | 505 | |
506 | 506 | foreach ($groups as $id_group) { |
507 | 507 | $ws_usergroup = new WorkstationUserGroup($this->db); |
@@ -514,7 +514,7 @@ discard block |
||
514 | 514 | // Resources |
515 | 515 | $resources = GETPOST('resources', 'array:int'); |
516 | 516 | WorkstationResource::deleteAllResourcesOfWorkstation($this->id); |
517 | - $this->resources=array(); |
|
517 | + $this->resources = array(); |
|
518 | 518 | if (!empty($resources)) { |
519 | 519 | foreach ($resources as $id_resource) { |
520 | 520 | $ws_resource = new WorkstationResource($this->db); |
@@ -884,7 +884,7 @@ discard block |
||
884 | 884 | if (getDolGlobalString('WORKSTATION_WORKSTATION_ADDON')) { |
885 | 885 | $mybool = false; |
886 | 886 | |
887 | - $file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON') . ".php"; |
|
887 | + $file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON').".php"; |
|
888 | 888 | $classname = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON'); |
889 | 889 | |
890 | 890 | // Include file with class |
@@ -17,4 +17,4 @@ |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | global $conf, $langs, $user, $db; |
20 | -include_once __DIR__ . '/../../htdocs/main.inc.php'; |
|
20 | +include_once __DIR__.'/../../htdocs/main.inc.php'; |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things. |
4 | -define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs'); |
|
5 | -define('DOL_DATA_ROOT', __DIR__ . '/../../documents'); |
|
4 | +define('DOL_DOCUMENT_ROOT', __DIR__.'/../../htdocs'); |
|
5 | +define('DOL_DATA_ROOT', __DIR__.'/../../documents'); |
|
6 | 6 | define('DOL_URL_ROOT', '/'); |
7 | 7 | define('DOL_MAIN_URL_ROOT', '/'); |
8 | 8 | define('MAIN_DB_PREFIX', 'llx_'); |