@@ -118,7 +118,7 @@ |
||
118 | 118 | if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED') && $user->hasRight('supplier_proposal', 'lire')) { |
119 | 119 | $arrayresult['searchintosupplierpropal'] = array('position' => 100, 'img' => 'object_supplier_proposal', 'label' => $langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text' => img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"') . ' ' . $langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url' => constant('BASE_URL') . '/supplier_proposal/list.php' . ($search_boxvalue ? '?search_all=' . urlencode($search_boxvalue) : '')); |
120 | 120 | } |
121 | -if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) { |
|
121 | +if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) { |
|
122 | 122 | $arrayresult['searchintosupplierorder'] = array('position' => 110, 'img' => 'object_supplier_order', 'label' => $langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text' => img_picto('', 'object_supplier_order', 'class="pictofixedwidth"') . ' ' . $langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url' => constant('BASE_URL') . '/fourn/commande/list.php' . ($search_boxvalue ? '?search_all=' . urlencode($search_boxvalue) : '')); |
123 | 123 | } |
124 | 124 | if (isModEnabled('reception') && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_RECEPTION_DISABLED') && $user->hasRight('reception', 'lire')) { |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | // Security check |
48 | 48 | if (!isModEnabled('incoterm')) { |
49 | - httponly_accessforbidden("Module incoterm not enabled"); // This includes the exit. |
|
49 | + httponly_accessforbidden("Module incoterm not enabled"); // This includes the exit. |
|
50 | 50 | } |
51 | 51 | // There is no other permission on this component. Everybody connected can read content of the incoterm table |
52 | 52 |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | if ($reshook > 0) { |
140 | 140 | $perm = $hookmanager->resArray['perm']; |
141 | 141 | } |
142 | - if (! $perm) { |
|
142 | + if (!$perm) { |
|
143 | 143 | // We should not be here. If we are not allowed to reorder rows, feature should not be visible on script. |
144 | 144 | // If we are here, it is a hack attempt, so we report a warning. |
145 | 145 | print 'Bad permission to modify position of lines for object in table ' . $table_element_line; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | // Reorder line to have position of children lines sharing same counter than parent lines |
163 | 163 | // This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database. |
164 | - if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) { |
|
164 | + if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) { |
|
165 | 165 | $result = $row->line_order(true); |
166 | 166 | } |
167 | 167 | } else { |
@@ -131,7 +131,7 @@ |
||
131 | 131 | $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = ' . ((int) $user->id); |
132 | 132 | $sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '" . $db->idate(dol_now()) . "'"; |
133 | 133 | $sql .= " AND ar.status = 0"; |
134 | - $sql .= " AND ar.entity = " . ((int) $conf->entity); // No sharing of entity for alerts |
|
134 | + $sql .= " AND ar.entity = " . ((int) $conf->entity); // No sharing of entity for alerts |
|
135 | 135 | $sql .= $db->order('datep', 'ASC'); |
136 | 136 | $sql .= $db->plimit(10); // Avoid too many notification at once |
137 | 137 |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | // Load object according to $id and $element |
55 | 55 | $object = fetchObjectByElement($id, $element); |
56 | 56 | if (!is_object($object)) { |
57 | - httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found."); // This includes the exit. |
|
57 | + httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found."); // This includes the exit. |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | $object->fields[$field] = array('type' => $format, 'enabled' => 1); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | if (!empty($user->socid)) { |
73 | 73 | $socid = $user->socid; |
74 | 74 | if (!empty($object->socid) && $socid != $object->socid) { |
75 | - httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
75 | + httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) { // Special case for products |
84 | 84 | restrictedArea($user, 'produit|service', $object, 'product&product', '', '', 'rowid'); |
85 | 85 | } else { |
86 | - httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported."); // This includes the exit. |
|
86 | + httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported."); // This includes the exit. |
|
87 | 87 | } |
88 | 88 | |
89 | 89 |
@@ -71,7 +71,7 @@ |
||
71 | 71 | $title = $langs->trans("Bookmarks"); |
72 | 72 | |
73 | 73 | // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests |
74 | -$head = '<!-- Bookmarks -->' . "\n"; // This is used by DoliDroid to know page is a bookmark selection page |
|
74 | +$head = '<!-- Bookmarks -->' . "\n"; // This is used by DoliDroid to know page is a bookmark selection page |
|
75 | 75 | $arrayofjs = array(); |
76 | 76 | $arrayofcss = array(); |
77 | 77 | top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); |
@@ -398,7 +398,7 @@ |
||
398 | 398 | $object->actionmsg = $message; // Long text |
399 | 399 | $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentByTo')...); |
400 | 400 | if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) { |
401 | - $object->actionmsg2 = $subject; // Short text |
|
401 | + $object->actionmsg2 = $subject; // Short text |
|
402 | 402 | } |
403 | 403 | |
404 | 404 | $object->trackid = $trackid; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | } |
115 | 115 | |
116 | 116 | |
117 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
117 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
118 | 118 | /** |
119 | 119 | * Fonction generant la rapport sur le disque |
120 | 120 | * |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | */ |
127 | 127 | public function write_file($_dir, $month, $year, $outputlangs) |
128 | 128 | { |
129 | - // phpcs:enable |
|
129 | + // phpcs:enable |
|
130 | 130 | include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; |
131 | 131 | |
132 | 132 | global $conf, $hookmanager, $langs, $user; |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | return 1; |
383 | 383 | } |
384 | 384 | |
385 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
385 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
386 | 386 | /** |
387 | 387 | * Show top header of page. |
388 | 388 | * |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | */ |
395 | 395 | protected function _pagehead(&$pdf, $page, $showaddress, $outputlangs) |
396 | 396 | { |
397 | - // phpcs:enable |
|
397 | + // phpcs:enable |
|
398 | 398 | |
399 | 399 | // Do not add the BACKGROUND as this is a report |
400 | 400 | //pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | } |
458 | 458 | |
459 | 459 | |
460 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
460 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
461 | 461 | /** |
462 | 462 | * Output body |
463 | 463 | * |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | */ |
470 | 470 | public function Body(&$pdf, $page, $lines, $outputlangs) |
471 | 471 | { |
472 | - // phpcs:enable |
|
472 | + // phpcs:enable |
|
473 | 473 | global $langs, $conf; |
474 | 474 | $default_font_size = pdf_getPDFFontSize($outputlangs); |
475 | 475 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | public $name = 'Muguet'; |
59 | 59 | |
60 | - public $prefix = 'PO'; // PO for "Purchase Order" |
|
60 | + public $prefix = 'PO'; // PO for "Purchase Order" |
|
61 | 61 | |
62 | 62 | |
63 | 63 | /** |