@@ -1615,7 +1615,9 @@ |
||
1615 | 1615 | global $conf, $langs; |
1616 | 1616 | |
1617 | 1617 | $ltrdirection = 'L'; |
1618 | - if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R'; |
|
1618 | + if ($outputlangs->trans("DIRECTION") == 'rtl') { |
|
1619 | + $ltrdirection = 'R'; |
|
1620 | + } |
|
1619 | 1621 | |
1620 | 1622 | // Load traductions files required by page |
1621 | 1623 | $outputlangs->loadLangs(array("main", "bills", "propal", "companies")); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | // $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher |
451 | 451 | |
452 | 452 | // $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks) |
453 | - $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
453 | + $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
454 | 454 | $this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
455 | 455 | |
456 | 456 | // You can add more thing under header here, if you increase $extra_under_address_shift too. |
@@ -687,7 +687,7 @@ discard block |
||
687 | 687 | } |
688 | 688 | |
689 | 689 | $pdf->setTopMargin($this->tab_top_newpage); |
690 | - $page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs); |
|
690 | + $page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs); |
|
691 | 691 | $pdf->setPageOrientation('', 1, $page_bottom_margin); |
692 | 692 | $pageposbefore = $pdf->getPage(); |
693 | 693 | |
@@ -930,7 +930,7 @@ discard block |
||
930 | 930 | if (!isset($this->tva[$vatrate])) { |
931 | 931 | $this->tva[$vatrate] = 0; |
932 | 932 | } |
933 | - $this->tva[$vatrate] += $tvaligne; // ->tva is abandonned, we use now ->tva_array that is more complete |
|
933 | + $this->tva[$vatrate] += $tvaligne; // ->tva is abandonned, we use now ->tva_array that is more complete |
|
934 | 934 | $vatcode = $object->lines[$i]->vat_src_code; |
935 | 935 | if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) { |
936 | 936 | $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0; |
@@ -1223,8 +1223,8 @@ discard block |
||
1223 | 1223 | $posy = $pdf->GetY() + 4; |
1224 | 1224 | } |
1225 | 1225 | |
1226 | - $posxval = 52; // Position of values of properties shown on left side |
|
1227 | - $posxend = 110; // End of x for text on left side |
|
1226 | + $posxval = 52; // Position of values of properties shown on left side |
|
1227 | + $posxend = 110; // End of x for text on left side |
|
1228 | 1228 | if ($this->page_largeur < 210) { // To work with US executive format |
1229 | 1229 | $posxend -= 10; |
1230 | 1230 | } |
@@ -1254,7 +1254,7 @@ discard block |
||
1254 | 1254 | |
1255 | 1255 | $pdf->SetFont('', '', $default_font_size - 2); |
1256 | 1256 | $pdf->SetXY($posxval, $posy); |
1257 | - $categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation); |
|
1257 | + $categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation); |
|
1258 | 1258 | $pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L'); |
1259 | 1259 | |
1260 | 1260 | $posy = $pdf->GetY() + 3; // for 2 lines |
@@ -1299,7 +1299,7 @@ discard block |
||
1299 | 1299 | require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php'; |
1300 | 1300 | $bac = new CompanyBankAccount($this->db); |
1301 | 1301 | $bac->fetch(0, $object->thirdparty->id); |
1302 | - $iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; |
|
1302 | + $iban = $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; |
|
1303 | 1303 | $lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1)); |
1304 | 1304 | } |
1305 | 1305 | |
@@ -1988,7 +1988,7 @@ discard block |
||
1988 | 1988 | if (empty($hidetop)) { |
1989 | 1989 | // Show category of operations |
1990 | 1990 | if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) { |
1991 | - $categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation); |
|
1991 | + $categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation); |
|
1992 | 1992 | $pdf->SetXY($this->marge_gauche, $tab_top - 4); |
1993 | 1993 | $pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations); |
1994 | 1994 | } |
@@ -2101,7 +2101,7 @@ discard block |
||
2101 | 2101 | } |
2102 | 2102 | if ($this->situationinvoice) { |
2103 | 2103 | $langs->loadLangs(array("other")); |
2104 | - $title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -"; |
|
2104 | + $title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -"; |
|
2105 | 2105 | } |
2106 | 2106 | if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) { |
2107 | 2107 | $title .= ' - '; |
@@ -2371,11 +2371,11 @@ discard block |
||
2371 | 2371 | $contactshipping = $object->fetch_Contact($idaddressshipping[0]); |
2372 | 2372 | $companystatic = new Societe($this->db); |
2373 | 2373 | $companystatic->fetch($object->contact->fk_soc); |
2374 | - $carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs); |
|
2374 | + $carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs); |
|
2375 | 2375 | $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $companystatic, $object->contact, $usecontact, 'target', $object); |
2376 | 2376 | } else { |
2377 | - $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs); |
|
2378 | - $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); |
|
2377 | + $carac_client_name_shipping = pdfBuildThirdpartyName($object->thirdparty, $outputlangs); |
|
2378 | + $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); |
|
2379 | 2379 | } |
2380 | 2380 | if (!empty($carac_client_shipping)) { |
2381 | 2381 | $posy += $hautcadre; |
@@ -2394,7 +2394,7 @@ discard block |
||
2394 | 2394 | $posy = $pdf->getY(); |
2395 | 2395 | |
2396 | 2396 | // Show shipping information |
2397 | - $pdf->SetXY($posx+2, $posy); |
|
2397 | + $pdf->SetXY($posx + 2, $posy); |
|
2398 | 2398 | $pdf->SetFont('', '', $default_font_size - 1); |
2399 | 2399 | $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L'); |
2400 | 2400 | $shipp_shift += $hautcadre; |
@@ -129,11 +129,11 @@ |
||
129 | 129 | unset($object->barcode_type_code); |
130 | 130 | unset($object->barcode_type_label); |
131 | 131 | |
132 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
133 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
134 | - unset($object->note); // We use note_public or note_private now |
|
135 | - unset($object->contact); // We use contact_id now |
|
136 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
132 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
133 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
134 | + unset($object->note); // We use note_public or note_private now |
|
135 | + unset($object->contact); // We use contact_id now |
|
136 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
137 | 137 | |
138 | 138 | unset($object->projet); // Should be fk_project |
139 | 139 | unset($object->project); // Should be fk_project |
@@ -193,7 +193,7 @@ |
||
193 | 193 | $facavoir->fetch($facid); |
194 | 194 | $invoicecredits[] = $facavoir->getNomUrl(1); |
195 | 195 | } |
196 | - print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')'; |
|
196 | + print ' ('.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits).')'; |
|
197 | 197 | } |
198 | 198 | /* |
199 | 199 | if ($facidnext > 0) { |
@@ -335,10 +335,10 @@ |
||
335 | 335 | if (in_array($element, ['context1', 'context2'])) { |
336 | 336 | $datacount = 0; |
337 | 337 | |
338 | - $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&module='.$element; |
|
338 | + $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&module='.$element; |
|
339 | 339 | $parameters['head'][$counter][1] = $langs->trans('MyModuleTab'); |
340 | 340 | if ($datacount > 0) { |
341 | - $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>'; |
|
341 | + $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>'; |
|
342 | 342 | } |
343 | 343 | $parameters['head'][$counter][2] = 'mymoduleemails'; |
344 | 344 | $counter++; |
@@ -270,7 +270,7 @@ |
||
270 | 270 | $reponsesadd = str_split($obj->reponses); |
271 | 271 | $lengthresponses = count($reponsesadd); |
272 | 272 | for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) { |
273 | - $reponsesadd[$cpt] = $reponsesadd[$cpt-1]; |
|
273 | + $reponsesadd[$cpt] = $reponsesadd[$cpt - 1]; |
|
274 | 274 | } |
275 | 275 | $reponsesadd[$cleinsertion] = '0'; |
276 | 276 | $reponsesadd = implode($reponsesadd); |
@@ -436,8 +436,12 @@ discard block |
||
436 | 436 | $tmpuser->fetch($object->user_author_id); |
437 | 437 | |
438 | 438 | $creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs); |
439 | - if ($tmpuser->email) $creator_info .= ', '.$langs->trans("EMail").': '.$tmpuser->email; |
|
440 | - if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone; |
|
439 | + if ($tmpuser->email) { |
|
440 | + $creator_info .= ', '.$langs->trans("EMail").': '.$tmpuser->email; |
|
441 | + } |
|
442 | + if ($tmpuser->office_phone) { |
|
443 | + $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone; |
|
444 | + } |
|
441 | 445 | |
442 | 446 | $notetoshow = dol_concatdesc($notetoshow, $creator_info); |
443 | 447 | } |
@@ -1519,7 +1523,9 @@ discard block |
||
1519 | 1523 | global $conf, $langs; |
1520 | 1524 | |
1521 | 1525 | $ltrdirection = 'L'; |
1522 | - if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R'; |
|
1526 | + if ($outputlangs->trans("DIRECTION") == 'rtl') { |
|
1527 | + $ltrdirection = 'R'; |
|
1528 | + } |
|
1523 | 1529 | |
1524 | 1530 | // Load traductions files required by page |
1525 | 1531 | $outputlangs->loadLangs(array("main", "propal", "companies", "bills")); |
@@ -197,12 +197,18 @@ discard block |
||
197 | 197 | |
198 | 198 | // Clean parameters |
199 | 199 | $price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value. |
200 | - if (empty($price)) $price = 0; |
|
200 | + if (empty($price)) { |
|
201 | + $price = 0; |
|
202 | + } |
|
201 | 203 | $now = (!empty($datem) ? $datem : dol_now()); |
202 | 204 | |
203 | 205 | // Check parameters |
204 | - if (!($fk_product > 0)) return 0; |
|
205 | - if (!($entrepot_id > 0)) return 0; |
|
206 | + if (!($fk_product > 0)) { |
|
207 | + return 0; |
|
208 | + } |
|
209 | + if (!($entrepot_id > 0)) { |
|
210 | + return 0; |
|
211 | + } |
|
206 | 212 | |
207 | 213 | if (is_numeric($eatby) && $eatby < 0) { |
208 | 214 | dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterEatBy eatby = ".$eatby); |
@@ -245,7 +251,9 @@ discard block |
||
245 | 251 | // Define if we must make the stock change (If product type is a service or if stock is used also for services) |
246 | 252 | // Only record into stock tables wil be disabled by this (the rest like writing into lot table or movement of subproucts are done) |
247 | 253 | $movestock = 0; |
248 | - if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock = 1; |
|
254 | + if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { |
|
255 | + $movestock = 1; |
|
256 | + } |
|
249 | 257 | |
250 | 258 | $this->db->begin(); |
251 | 259 | |
@@ -377,7 +385,9 @@ discard block |
||
377 | 385 | } |
378 | 386 | |
379 | 387 | $foundforbatch = 1; |
380 | - if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty; |
|
388 | + if ($prodbatch->qty < abs($qty)) { |
|
389 | + $qtyisnotenough = $prodbatch->qty; |
|
390 | + } |
|
381 | 391 | break; |
382 | 392 | } |
383 | 393 | if (!$foundforbatch || $qtyisnotenough) { |
@@ -578,7 +588,9 @@ discard block |
||
578 | 588 | if ($movestock && !$error) { |
579 | 589 | // Call trigger |
580 | 590 | $result = $this->call_trigger('STOCK_MOVEMENT', $user); |
581 | - if ($result < 0) $error++; |
|
591 | + if ($result < 0) { |
|
592 | + $error++; |
|
593 | + } |
|
582 | 594 | // End call triggers |
583 | 595 | |
584 | 596 | // Check unicity for serial numbered equipments once all movement were done. |
@@ -845,7 +857,9 @@ discard block |
||
845 | 857 | $resql = $this->db->query($sql); |
846 | 858 | if ($resql) { |
847 | 859 | $obj = $this->db->fetch_object($resql); |
848 | - if ($obj) $nb = $obj->nb; |
|
860 | + if ($obj) { |
|
861 | + $nb = $obj->nb; |
|
862 | + } |
|
849 | 863 | return (empty($nb) ? 0 : $nb); |
850 | 864 | } else { |
851 | 865 | dol_print_error($this->db); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | 'skip_batch' => &$skip_batch, |
199 | 199 | 'id_product_batch' => &$id_product_batch |
200 | 200 | ); |
201 | - $reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
|
201 | + $reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
|
202 | 202 | |
203 | 203 | if ($reshook < 0) { |
204 | 204 | if (!empty($hookmanager->resPrint)) { |
@@ -665,8 +665,8 @@ discard block |
||
665 | 665 | $this->price = $obj->price; |
666 | 666 | $this->fk_user_author = $obj->fk_user_author; |
667 | 667 | $this->label = $obj->label; |
668 | - $this->fk_origin = $obj->origin_id; // For backward compatibility |
|
669 | - $this->origintype = $obj->origin_type; // For backward compatibility |
|
668 | + $this->fk_origin = $obj->origin_id; // For backward compatibility |
|
669 | + $this->origintype = $obj->origin_type; // For backward compatibility |
|
670 | 670 | $this->origin_id = $obj->origin_id; |
671 | 671 | $this->origin_type = $obj->origin_type; |
672 | 672 | $this->inventorycode = $obj->inventorycode; |
@@ -894,8 +894,8 @@ discard block |
||
894 | 894 | } else { // product_batch record not found |
895 | 895 | $pdluo->fk_product_stock = $vfk_product_stock; |
896 | 896 | $pdluo->qty = $qty; |
897 | - $pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table. |
|
898 | - $pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table. |
|
897 | + $pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table. |
|
898 | + $pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table. |
|
899 | 899 | $pdluo->batch = $vbatchnumber; |
900 | 900 | |
901 | 901 | $result = $pdluo->create($user, 1); |
@@ -1205,8 +1205,8 @@ discard block |
||
1205 | 1205 | $sql = "SELECT sum(pb.qty) as cpt"; |
1206 | 1206 | $sql .= " FROM ".$this->db->prefix()."product_batch as pb"; |
1207 | 1207 | $sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock"; |
1208 | - $sql .= " WHERE ps.fk_product = " . ((int) $fk_product); |
|
1209 | - $sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'"; |
|
1208 | + $sql .= " WHERE ps.fk_product = ".((int) $fk_product); |
|
1209 | + $sql .= " AND pb.batch = '".$this->db->escape($batch)."'"; |
|
1210 | 1210 | |
1211 | 1211 | $result = $this->db->query($sql); |
1212 | 1212 | if ($result) { |
@@ -113,8 +113,10 @@ |
||
113 | 113 | $search_all = GETPOST("search_all", 'alpha'); |
114 | 114 | $search = array(); |
115 | 115 | foreach ($object->fields as $key => $val) { |
116 | - if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha'); |
|
117 | -} |
|
116 | + if (GETPOST('search_'.$key, 'alpha') !== '') { |
|
117 | + $search[$key] = GETPOST('search_'.$key, 'alpha'); |
|
118 | + } |
|
119 | + } |
|
118 | 120 | |
119 | 121 | // List of fields to search into when doing a "search in all" |
120 | 122 | $fieldstosearchall = array(); |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | $this->menu = array(); |
264 | 264 | $r = 0; |
265 | 265 | // Add here entries to declare new menus |
266 | - $this->menu[$r++]=array( |
|
266 | + $this->menu[$r++] = array( |
|
267 | 267 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
268 | 268 | 'fk_menu'=>'fk_mainmenu=mrp', |
269 | 269 | // This is a Left menu entry |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | 'url'=>'', |
276 | 276 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
277 | 277 | 'langs'=>'mrp', |
278 | - 'position'=>1100+$r, |
|
278 | + 'position'=>1100 + $r, |
|
279 | 279 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
280 | 280 | 'enabled'=>'$conf->workstation->enabled', |
281 | 281 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | // 0=Menu for internal users, 1=external users, 2=both |
285 | 285 | 'user'=>2, |
286 | 286 | ); |
287 | - $this->menu[$r++]=array( |
|
287 | + $this->menu[$r++] = array( |
|
288 | 288 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
289 | 289 | 'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation', |
290 | 290 | // This is a Left menu entry |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | 'url'=>'/workstation/workstation_card.php?action=create', |
296 | 296 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
297 | 297 | 'langs'=>'mrp', |
298 | - 'position'=>1100+$r, |
|
298 | + 'position'=>1100 + $r, |
|
299 | 299 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
300 | 300 | 'enabled'=>'$conf->workstation->enabled', |
301 | 301 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | // 0=Menu for internal users, 1=external users, 2=both |
305 | 305 | 'user'=>2 |
306 | 306 | ); |
307 | - $this->menu[$r++]=array( |
|
307 | + $this->menu[$r++] = array( |
|
308 | 308 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
309 | 309 | 'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation', |
310 | 310 | // This is a Left menu entry |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | 'url'=>'/workstation/workstation_list.php', |
316 | 316 | // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
317 | 317 | 'langs'=>'mrp', |
318 | - 'position'=>1101+$r, |
|
318 | + 'position'=>1101 + $r, |
|
319 | 319 | // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
320 | 320 | 'enabled'=>'$conf->workstation->enabled', |
321 | 321 | // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules |