@@ -774,7 +774,7 @@ |
||
774 | 774 | $hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords)))); |
775 | 775 | |
776 | 776 | // Open Graph |
777 | - $out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article |
|
777 | + $out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article |
|
778 | 778 | $out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n"; |
779 | 779 | if ($websitepage->image) { |
780 | 780 | $out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n"; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $sql .= ", s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , f.datec , f.fk_soc , cp.label as country "; |
140 | 140 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
141 | 141 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
142 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
142 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
143 | 143 | } |
144 | 144 | $sql .= ", ".MAIN_DB_PREFIX."facture as f"; |
145 | 145 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , ff.datec , ff.fk_soc , cp.label as country "; |
164 | 164 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
165 | 165 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
166 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
166 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
167 | 167 | } |
168 | 168 | $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as ff"; |
169 | 169 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -81,9 +81,9 @@ |
||
81 | 81 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
83 | 83 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
84 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php'; |
|
85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php'; |
|
86 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
84 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
|
85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
|
86 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
87 | 87 | |
88 | 88 | // Load translation files required by the page |
89 | 89 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | // Default sort order (if not yet defined by previous GETPOST) |
111 | 111 | if (!$sortfield) { |
112 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
112 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
113 | 113 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
114 | 114 | } |
115 | 115 | if (!$sortorder) { |
@@ -273,13 +273,13 @@ discard block |
||
273 | 273 | } |
274 | 274 | } else { |
275 | 275 | if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') { |
276 | - $columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
276 | + $columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
277 | 277 | if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) { |
278 | 278 | if (preg_match('/_dtstart$/', $key)) { |
279 | - $sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'"; |
|
279 | + $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
|
280 | 280 | } |
281 | 281 | if (preg_match('/_dtend$/', $key)) { |
282 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
282 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
283 | 283 | } |
284 | 284 | } |
285 | 285 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | // Default sort order (if not yet defined by previous GETPOST) |
111 | 111 | if (!$sortfield) { |
112 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
112 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
113 | 113 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
114 | 114 | } |
115 | 115 | if (!$sortorder) { |
@@ -273,13 +273,13 @@ discard block |
||
273 | 273 | } |
274 | 274 | } else { |
275 | 275 | if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') { |
276 | - $columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
276 | + $columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key); |
|
277 | 277 | if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) { |
278 | 278 | if (preg_match('/_dtstart$/', $key)) { |
279 | - $sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'"; |
|
279 | + $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
|
280 | 280 | } |
281 | 281 | if (preg_match('/_dtend$/', $key)) { |
282 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
282 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
283 | 283 | } |
284 | 284 | } |
285 | 285 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | // Put here all includes required by your class file |
29 | 29 | require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; |
30 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php'; |
|
30 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php'; |
|
31 | 31 | //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; |
32 | 32 | //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; |
33 | 33 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | /** |
104 | 104 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
105 | 105 | */ |
106 | - public $fields=array( |
|
106 | + public $fields = array( |
|
107 | 107 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
108 | 108 | 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,), |
109 | 109 | 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,), |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
83 | 83 | require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
84 | 84 | require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
86 | 86 | |
87 | 87 | |
88 | 88 | // Load translation files required by the page |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | // List of all actions |
271 | 271 | $filters = array(); |
272 | 272 | $filters['search_agenda_label'] = $search_agenda_label; |
273 | - $object->fields['label']=array(); // Usefull to get only get agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
273 | + $object->fields['label'] = array(); // Usefull to get only get agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
274 | 274 | |
275 | 275 | // TODO Replace this with same code than into list.php |
276 | 276 | show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module); |
@@ -91,8 +91,8 @@ |
||
91 | 91 | $label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT'); |
92 | 92 | $qty_default = 1; |
93 | 93 | |
94 | - print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">'; |
|
95 | - print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">'; |
|
94 | + print '<input type="text" id="label" name="label" class="takepospay" value="'.$label_default.'" style="width:40%;" placeholder="'.$langs->trans('Label').'">'; |
|
95 | + print '<input type="text" id="qty" name="qty" class="takepospay" value="'.$qty_default.'" style="width:10%;" placeholder="'.$langs->trans('Qty').'">'; |
|
96 | 96 | } |
97 | 97 | ?> |
98 | 98 | <input type="button" class="button takepospay clearboth" value="OK" onclick="Save();"> |
@@ -273,7 +273,7 @@ |
||
273 | 273 | print '<tr class="oddeven"><td>'; |
274 | 274 | print $langs->trans('PrintWithoutDetailsLabelDefault'); |
275 | 275 | print '<td colspan="2">'; |
276 | - print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />'; |
|
276 | + print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />'; |
|
277 | 277 | print "</td></tr>\n"; |
278 | 278 | } |
279 | 279 |