@@ -1127,8 +1127,8 @@ discard block |
||
1127 | 1127 | $stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport); |
1128 | 1128 | $stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport); |
1129 | 1129 | $stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport); |
1130 | - $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content |
|
1131 | - $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content |
|
1130 | + $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content |
|
1131 | + $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content |
|
1132 | 1132 | $stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport); |
1133 | 1133 | $stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport); |
1134 | 1134 | |
@@ -1403,7 +1403,7 @@ discard block |
||
1403 | 1403 | foreach ($aliasesarray as $aliasshortcuttocreate) { |
1404 | 1404 | if (trim($aliasshortcuttocreate)) { |
1405 | 1405 | $filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php'; |
1406 | - $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories. |
|
1406 | + $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories. |
|
1407 | 1407 | if (!$result) { |
1408 | 1408 | $this->errors[] = 'Failed to write file '.basename($filealias); |
1409 | 1409 | $error++; |
@@ -1424,7 +1424,7 @@ discard block |
||
1424 | 1424 | $filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php'; |
1425 | 1425 | } |
1426 | 1426 | $filewrapper = $pathofwebsite.'/wrapper.php'; |
1427 | - dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories |
|
1427 | + dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories |
|
1428 | 1428 | } |
1429 | 1429 | |
1430 | 1430 | if ($error) { |
@@ -2012,7 +2012,7 @@ discard block |
||
2012 | 2012 | $destContent = file_get_contents($fileNeeded['fullname']); |
2013 | 2013 | |
2014 | 2014 | $numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']); |
2015 | - $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource)); |
|
2015 | + $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest, $numOfPageSource)); |
|
2016 | 2016 | $differences['file_destination'] = $fileNeeded; |
2017 | 2017 | } |
2018 | 2018 | return $differences; |
@@ -2053,10 +2053,10 @@ discard block |
||
2053 | 2053 | $linefound = array(); |
2054 | 2054 | $countNumPage = count($exceptNumPge); |
2055 | 2055 | |
2056 | - for ($i = 0;$i < $countNumPage; $i++) { |
|
2056 | + for ($i = 0; $i < $countNumPage; $i++) { |
|
2057 | 2057 | $linefound[$i] = array(); |
2058 | - $linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/'; |
|
2059 | - $linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/'; |
|
2058 | + $linefound[$i]['meta'] = '/content="'.preg_quote($exceptNumPge[$i], '/').'" \/>/'; |
|
2059 | + $linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", '.preg_quote($exceptNumPge[$i], '/').'\);/'; |
|
2060 | 2060 | } |
2061 | 2061 | |
2062 | 2062 | if ($countNumPage >= 2) { |
@@ -2079,13 +2079,13 @@ discard block |
||
2079 | 2079 | if ($lineContent1 !== $lineContent2) { |
2080 | 2080 | if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) { |
2081 | 2081 | // Ligne deleted de la source |
2082 | - $diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1; |
|
2082 | + $diff["Supprimée à la ligne ".($lineNum + 1)] = $lineContent1; |
|
2083 | 2083 | } elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) { |
2084 | 2084 | // Nouvelle ligne added dans la destination |
2085 | - $diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2; |
|
2085 | + $diff["Ajoutée à la ligne ".($lineNum + 1)] = $lineContent2; |
|
2086 | 2086 | } else { |
2087 | 2087 | // Différence found it |
2088 | - $diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2; |
|
2088 | + $diff["Modifiée à la ligne ".($lineNum + 1)] = $lineContent2; |
|
2089 | 2089 | } |
2090 | 2090 | } |
2091 | 2091 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | 'types' => $types, |
115 | 115 | 'recursive' => $recursive, |
116 | 116 | 'filter' => $filter, |
117 | - 'excludefilter' => $exclude_array, // Already converted to array. |
|
117 | + 'excludefilter' => $exclude_array, // Already converted to array. |
|
118 | 118 | 'sortcriteria' => $sortcriteria, |
119 | 119 | 'sortorder' => $sortorder, |
120 | 120 | 'loaddate' => $loaddate, |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | |
149 | 149 | $qualified = 1; |
150 | 150 | |
151 | - $utf8_fullpathfile = "$utf8_path/$utf8_file"; // Temp variable for speed |
|
151 | + $utf8_fullpathfile = "$utf8_path/$utf8_file"; // Temp variable for speed |
|
152 | 152 | |
153 | 153 | // Check if file is qualified |
154 | 154 | foreach ($excludefilterarray as $filt) { |
@@ -1391,7 +1391,7 @@ discard block |
||
1391 | 1391 | $return = move_uploaded_file($src_file_osencoded, $file_name_osencoded); |
1392 | 1392 | if ($return) { |
1393 | 1393 | dolChmod($file_name_osencoded); |
1394 | - dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=" . getDolGlobalString('MAIN_UMASK'), LOG_DEBUG); |
|
1394 | + dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".getDolGlobalString('MAIN_UMASK'), LOG_DEBUG); |
|
1395 | 1395 | return $successcode; // Success |
1396 | 1396 | } else { |
1397 | 1397 | dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR); |
@@ -1904,7 +1904,7 @@ discard block |
||
1904 | 1904 | $maxwidthmini = $tmparraysize['maxwidthmini']; |
1905 | 1905 | $maxheightmini = $tmparraysize['maxheightmini']; |
1906 | 1906 | //$quality = $tmparraysize['quality']; |
1907 | - $quality = 50; // For thumbs, we force quality to 50 |
|
1907 | + $quality = 50; // For thumbs, we force quality to 50 |
|
1908 | 1908 | |
1909 | 1909 | // Generate thumbs. |
1910 | 1910 | if ($generatethumbs) { |
@@ -2088,7 +2088,7 @@ discard block |
||
2088 | 2088 | if (isset($object->table_element)) { |
2089 | 2089 | $ecmfile->src_object_type = $object->table_element; |
2090 | 2090 | } else { |
2091 | - dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.'); |
|
2091 | + dol_syslog('Error: object '.get_class($object).' has no table_element attribute.'); |
|
2092 | 2092 | return -1; |
2093 | 2093 | } |
2094 | 2094 | if (isset($object->src_object_description)) { |
@@ -2291,9 +2291,9 @@ discard block |
||
2291 | 2291 | // Skip directories (they would be added automatically) |
2292 | 2292 | if (!$file->isDir()) { |
2293 | 2293 | // Get real and relative path for current file |
2294 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2294 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2295 | 2295 | $fileName = $file->getFilename(); |
2296 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2296 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2297 | 2297 | |
2298 | 2298 | //$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1); |
2299 | 2299 | $relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1); |
@@ -2560,9 +2560,9 @@ discard block |
||
2560 | 2560 | // Skip directories (they would be added automatically) |
2561 | 2561 | if (!$file->isDir()) { |
2562 | 2562 | // Get real and relative path for current file |
2563 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2563 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2564 | 2564 | $fileName = $file->getFilename(); |
2565 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2565 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2566 | 2566 | |
2567 | 2567 | //$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1); |
2568 | 2568 | $relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * \brief Class file used to generate the dispatch slips for the Eagle model |
29 | 29 | */ |
30 | 30 | |
31 | -require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php'; |
|
31 | +require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfer.php'; |
|
32 | 32 | require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; |
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; |
34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | $pdf->SetFont(pdf_getPDFFont($outputlangs)); |
303 | 303 | // Set path to the background PDF File |
304 | 304 | if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) { |
305 | - $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
305 | + $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')); |
|
306 | 306 | $tplidx = $pdf->importPage(1); |
307 | 307 | } |
308 | 308 |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | * Actions |
171 | 171 | */ |
172 | 172 | |
173 | -$parameters=array(); |
|
174 | -$reshook=$hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
173 | +$parameters = array(); |
|
174 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
175 | 175 | if ($reshook < 0) { |
176 | 176 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
177 | 177 | } |
@@ -186,9 +186,9 @@ discard block |
||
186 | 186 | $bankaccount = GETPOSTINT('accountid'); |
187 | 187 | } else { |
188 | 188 | if ($pay == 'LIQ') { |
189 | - $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]); // For backward compatibility |
|
189 | + $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]); // For backward compatibility |
|
190 | 190 | } elseif ($pay == "CHQ") { |
191 | - $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]); // For backward compatibility |
|
191 | + $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]); // For backward compatibility |
|
192 | 192 | } else { |
193 | 193 | $accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"]; |
194 | 194 | $bankaccount = getDolGlobalInt($accountname); |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | $savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL'); |
249 | 249 | |
250 | 250 | if (isModEnabled('productbatch') && !getDolGlobalInt('CASHDESK_FORCE_DECREASE_STOCK')) { |
251 | - $conf->global->STOCK_CALCULATE_ON_BILL = 0; // To not change the stock (not yet compatible with batch management) |
|
251 | + $conf->global->STOCK_CALCULATE_ON_BILL = 0; // To not change the stock (not yet compatible with batch management) |
|
252 | 252 | } else { |
253 | - $conf->global->STOCK_CALCULATE_ON_BILL = 1; // To force the change of stock |
|
253 | + $conf->global->STOCK_CALCULATE_ON_BILL = 1; // To force the change of stock |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | } |
329 | 329 | // Update stock for batch products |
330 | 330 | if (isModEnabled('productbatch')) { |
331 | - require_once DOL_DOCUMENT_ROOT . "/product/stock/class/mouvementstock.class.php"; |
|
331 | + require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"; |
|
332 | 332 | $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; |
333 | 333 | foreach ($invoice->lines as $line) { |
334 | 334 | if ($line->batch && $line->fk_warehouse > 0) { |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | $creditnote->socid = $invoice->socid; |
351 | 351 | $creditnote->date = dol_now(); |
352 | 352 | $creditnote->module_source = 'takepos'; |
353 | - $creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ; |
|
353 | + $creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''; |
|
354 | 354 | $creditnote->type = Facture::TYPE_CREDIT_NOTE; |
355 | 355 | $creditnote->fk_facture_source = $placeid; |
356 | 356 | //$creditnote->remise_absolue = $invoice->remise_absolue; |
@@ -501,9 +501,9 @@ discard block |
||
501 | 501 | // If we add a line and no invoice yet, we create the invoice |
502 | 502 | if (($action == "addline" || $action == "freezone") && $placeid == 0 && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { |
503 | 503 | $invoice->socid = getDolGlobalInt($constforcompanyid); |
504 | - $invoice->date = dol_now('tzuserrel'); // We use the local date, only the day will be saved. |
|
504 | + $invoice->date = dol_now('tzuserrel'); // We use the local date, only the day will be saved. |
|
505 | 505 | $invoice->module_source = 'takepos'; |
506 | - $invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ; |
|
506 | + $invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''; |
|
507 | 507 | $invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity; |
508 | 508 | |
509 | 509 | if ($invoice->socid <= 0) { |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | $batch = GETPOST('batch', 'alpha'); |
547 | 547 | |
548 | 548 | if (!empty($batch)) { |
549 | - $action="setbatch"; |
|
549 | + $action = "setbatch"; |
|
550 | 550 | } else { |
551 | 551 | // Set nb of suggested with nb of batch into the warehouse of the terminal |
552 | 552 | $nbofsuggested = 0; |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | echo "}"; |
567 | 567 | echo "</script>"; |
568 | 568 | |
569 | - if ($nbofsuggested>0) { |
|
569 | + if ($nbofsuggested > 0) { |
|
570 | 570 | echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>"; |
571 | 571 | foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) { // $dbatch is instance of Productbatch |
572 | 572 | $batchStock = + $dbatch->qty; // To get a numeric |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | if (getDolGlobalString('TAKEPOS_GROUP_SAME_PRODUCT')) { |
629 | 629 | foreach ($invoice->lines as $line) { |
630 | 630 | if ($line->product_ref == $prod->ref) { |
631 | - if ($line->special_code==4) { |
|
631 | + if ($line->special_code == 4) { |
|
632 | 632 | continue; |
633 | 633 | } // If this line is sended to printer create new line |
634 | 634 | // check if qty in stock |
@@ -678,7 +678,7 @@ discard block |
||
678 | 678 | |
679 | 679 | // complete line by hook |
680 | 680 | $parameters = array('prod' => $prod, 'line' => $line); |
681 | - $reshook=$hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks |
|
681 | + $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks |
|
682 | 682 | if ($reshook < 0) { |
683 | 683 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
684 | 684 | } |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | |
734 | 734 | if ($action == "addnote" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { |
735 | 735 | $desc = GETPOST('addnote', 'alpha'); |
736 | - if ($idline==0) { |
|
736 | + if ($idline == 0) { |
|
737 | 737 | $invoice->update_note($desc, '_public'); |
738 | 738 | } else { |
739 | 739 | foreach ($invoice->lines as $line) { |
@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | } |
867 | 867 | if (!$permissiontoupdateline) { |
868 | 868 | dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos").' - No permission to updateprice', null, 1); |
869 | - } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) { |
|
869 | + } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) { |
|
870 | 870 | $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit); |
871 | 871 | } else { |
872 | 872 | $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit); |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | $invoice->fetch($placeid); |
929 | 929 | } |
930 | 930 | |
931 | - if ($action=="setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { |
|
931 | + if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { |
|
932 | 932 | $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; |
933 | 933 | $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch=".$db->escape($batch).", fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded); |
934 | 934 | $db->query($sql); |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | |
1077 | 1077 | $sectionwithinvoicelink .= '</span><br>'; |
1078 | 1078 | if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) { |
1079 | - $sectionwithinvoicelink .= ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">Invoice</a>'; |
|
1079 | + $sectionwithinvoicelink .= ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.$invoice->ref.'/'.$invoice->ref.'.pdf">Invoice</a>'; |
|
1080 | 1080 | } elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") { |
1081 | 1081 | if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) { |
1082 | 1082 | $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.')">'.$langs->trans('PrintTicket').'</button>'; |
@@ -1115,7 +1115,7 @@ discard block |
||
1115 | 1115 | if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) { |
1116 | 1116 | $title = 'TakePOS - Dolibarr '.DOL_VERSION; |
1117 | 1117 | if (getDolGlobalString('MAIN_APPLICATION_TITLE')) { |
1118 | - $title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE'); |
|
1118 | + $title = 'TakePOS - '.getDolGlobalString('MAIN_APPLICATION_TITLE'); |
|
1119 | 1119 | } |
1120 | 1120 | $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/> |
1121 | 1121 | <meta name="apple-mobile-web-app-capable" content="yes"> |
@@ -1139,7 +1139,7 @@ discard block |
||
1139 | 1139 | <script type="text/javascript"> |
1140 | 1140 | var selectedline=0; |
1141 | 1141 | var selectedtext=""; |
1142 | -<?php if ($action=="valid") { |
|
1142 | +<?php if ($action == "valid") { |
|
1143 | 1143 | echo "var place=0;"; |
1144 | 1144 | }?> // Set to default place after close sale |
1145 | 1145 | var placeid=<?php echo($placeid > 0 ? $placeid : 0); ?>; |
@@ -1340,7 +1340,7 @@ discard block |
||
1340 | 1340 | if ($contactid > 0) { |
1341 | 1341 | $contact = new Contact($db); |
1342 | 1342 | $contact->fetch($contactid); |
1343 | - $s .= " - " . $contact->getFullName($langs); |
|
1343 | + $s .= " - ".$contact->getFullName($langs); |
|
1344 | 1344 | } |
1345 | 1345 | } |
1346 | 1346 | } |
@@ -1401,10 +1401,10 @@ discard block |
||
1401 | 1401 | $s = ''; |
1402 | 1402 | |
1403 | 1403 | $idwarehouse = 0; |
1404 | - $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); |
|
1404 | + $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); |
|
1405 | 1405 | if (isModEnabled('stock')) { |
1406 | 1406 | if (getDolGlobalString($constantforkey) != "1") { |
1407 | - $constantforkey = 'CASHDESK_ID_WAREHOUSE'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); |
|
1407 | + $constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); |
|
1408 | 1408 | $idwarehouse = getDolGlobalString($constantforkey); |
1409 | 1409 | if ($idwarehouse > 0) { |
1410 | 1410 | $s = '<span class="small">'; |
@@ -1551,8 +1551,8 @@ discard block |
||
1551 | 1551 | } |
1552 | 1552 | |
1553 | 1553 | // Complete header by hook |
1554 | -$parameters=array(); |
|
1555 | -$reshook=$hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1554 | +$parameters = array(); |
|
1555 | +$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1556 | 1556 | if ($reshook < 0) { |
1557 | 1557 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
1558 | 1558 | } |
@@ -1563,16 +1563,16 @@ discard block |
||
1563 | 1563 | print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>'; |
1564 | 1564 | if (getDolGlobalString('TAKEPOS_SHOW_HT')) { |
1565 | 1565 | print '<td class="linecolht right nowraponall">'; |
1566 | - print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>'; |
|
1566 | + print '<span class="opacitymedium small">'.$langs->trans('TotalHTShort').'</span><br>'; |
|
1567 | 1567 | // In phone version only show when it is invoice page |
1568 | 1568 | if (empty($mobilepage) || $mobilepage == "invoice") { |
1569 | - print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>'; |
|
1569 | + print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency).'</span>'; |
|
1570 | 1570 | if (isModEnabled('multicurrency') && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) { |
1571 | 1571 | //Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency |
1572 | - include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php'; |
|
1572 | + include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php'; |
|
1573 | 1573 | $multicurrency = new MultiCurrency($db); |
1574 | 1574 | $multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]); |
1575 | - print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>'; |
|
1575 | + print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>'; |
|
1576 | 1576 | } |
1577 | 1577 | } |
1578 | 1578 | print '</td>'; |
@@ -1713,8 +1713,8 @@ discard block |
||
1713 | 1713 | $htmlsupplements[$line->fk_parent_line] .= '</td>'; |
1714 | 1714 | |
1715 | 1715 | // complete line by hook |
1716 | - $parameters=array('line' => $line); |
|
1717 | - $reshook=$hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1716 | + $parameters = array('line' => $line); |
|
1717 | + $reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1718 | 1718 | if ($reshook < 0) { |
1719 | 1719 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
1720 | 1720 | } |
@@ -1763,7 +1763,7 @@ discard block |
||
1763 | 1763 | } |
1764 | 1764 | } |
1765 | 1765 | if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { |
1766 | - $htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext); |
|
1766 | + $htmlforlines .= $form->textwithpicto($line->product_label ? '<b>'.$line->product_ref.'</b> - '.$line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext); |
|
1767 | 1767 | } elseif (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 2) { |
1768 | 1768 | $htmlforlines .= $form->textwithpicto($line->product_ref ? '<b>'.$line->product_ref.'<b>' : dolGetFirstLineOfText($line->desc, 1), $tooltiptext); |
1769 | 1769 | } else { |
@@ -1809,8 +1809,8 @@ discard block |
||
1809 | 1809 | $htmlforlines .= '</td>'; |
1810 | 1810 | |
1811 | 1811 | // complete line by hook |
1812 | - $parameters=array('line' => $line); |
|
1813 | - $reshook=$hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1812 | + $parameters = array('line' => $line); |
|
1813 | + $reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks |
|
1814 | 1814 | if ($reshook < 0) { |
1815 | 1815 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
1816 | 1816 | } |
@@ -1910,7 +1910,7 @@ discard block |
||
1910 | 1910 | if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE && !getDolGlobalString('TAKEPOS_NO_CREDITNOTE')) { |
1911 | 1911 | print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>'; |
1912 | 1912 | if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) { |
1913 | - print ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">Invoice</a>'; |
|
1913 | + print ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.$invoice->ref.'/'.$invoice->ref.'.pdf">Invoice</a>'; |
|
1914 | 1914 | } |
1915 | 1915 | } |
1916 | 1916 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * \remarks To run this script as CLI: phpunit filename.php |
26 | 26 | */ |
27 | 27 | |
28 | -global $conf,$user,$langs,$db; |
|
28 | +global $conf, $user, $langs, $db; |
|
29 | 29 | //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver |
30 | 30 | //require_once 'PHPUnit/Autoload.php'; |
31 | 31 | require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | public function moduleInitListProvider() |
59 | 59 | { |
60 | 60 | $full_list = self::VALID_MODULE_MAPPING; |
61 | - $filtered_list = array_map(function ($value) { |
|
61 | + $filtered_list = array_map(function($value) { |
|
62 | 62 | return array($value); |
63 | - }, array_filter($full_list, function ($value) { |
|
63 | + }, array_filter($full_list, function($value) { |
|
64 | 64 | return $value !== null; |
65 | 65 | })); |
66 | 66 | return $filtered_list; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public function testModulesInit(string $modlabel) |
79 | 79 | { |
80 | - global $conf,$user,$langs,$db; |
|
80 | + global $conf, $user, $langs, $db; |
|
81 | 81 | |
82 | 82 | $conf = $this->savconf; |
83 | 83 | $user = $this->savuser; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * \remarks To run this script as CLI: phpunit filename.php |
26 | 26 | */ |
27 | 27 | |
28 | -global $conf,$user,$langs,$db; |
|
28 | +global $conf, $user, $langs, $db; |
|
29 | 29 | //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver |
30 | 30 | //require_once 'PHPUnit/Autoload.php'; |
31 | 31 | require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; |
@@ -33,35 +33,35 @@ discard block |
||
33 | 33 | require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php'; |
34 | 34 | require_once dirname(__FILE__).'/CommonClassTest.class.php'; |
35 | 35 | |
36 | -if (! defined('NOREQUIREUSER')) { |
|
36 | +if (!defined('NOREQUIREUSER')) { |
|
37 | 37 | define('NOREQUIREUSER', '1'); |
38 | 38 | } |
39 | -if (! defined('NOREQUIREDB')) { |
|
39 | +if (!defined('NOREQUIREDB')) { |
|
40 | 40 | define('NOREQUIREDB', '1'); |
41 | 41 | } |
42 | -if (! defined('NOREQUIRESOC')) { |
|
42 | +if (!defined('NOREQUIRESOC')) { |
|
43 | 43 | define('NOREQUIRESOC', '1'); |
44 | 44 | } |
45 | -if (! defined('NOREQUIRETRAN')) { |
|
45 | +if (!defined('NOREQUIRETRAN')) { |
|
46 | 46 | define('NOREQUIRETRAN', '1'); |
47 | 47 | } |
48 | -if (! defined('NOCSRFCHECK')) { |
|
48 | +if (!defined('NOCSRFCHECK')) { |
|
49 | 49 | define('NOCSRFCHECK', '1'); |
50 | 50 | } |
51 | -if (! defined('NOTOKENRENEWAL')) { |
|
51 | +if (!defined('NOTOKENRENEWAL')) { |
|
52 | 52 | define('NOTOKENRENEWAL', '1'); |
53 | 53 | } |
54 | -if (! defined('NOREQUIREMENU')) { |
|
54 | +if (!defined('NOREQUIREMENU')) { |
|
55 | 55 | define('NOREQUIREMENU', '1'); // If there is no menu to show |
56 | 56 | } |
57 | -if (! defined('NOREQUIREHTML')) { |
|
57 | +if (!defined('NOREQUIREHTML')) { |
|
58 | 58 | define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php |
59 | 59 | } |
60 | -if (! defined('NOREQUIREAJAX')) { |
|
60 | +if (!defined('NOREQUIREAJAX')) { |
|
61 | 61 | define('NOREQUIREAJAX', '1'); |
62 | 62 | } |
63 | -if (! defined("NOLOGIN")) { |
|
64 | - define("NOLOGIN", '1'); // If this page is public (can be called outside logged session) |
|
63 | +if (!defined("NOLOGIN")) { |
|
64 | + define("NOLOGIN", '1'); // If this page is public (can be called outside logged session) |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | if (empty($user->id)) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | )); |
114 | 114 | */ |
115 | - return array_map(function ($value) { |
|
115 | + return array_map(function($value) { |
|
116 | 116 | return array($value); |
117 | 117 | }, $filesarray); |
118 | 118 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | || preg_match('/modules\/(import|mailings|printing)\//', $file['relativename']) |
140 | 140 | || in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) { |
141 | 141 | // Check into Class files |
142 | - if (! in_array($file['name'], array( |
|
142 | + if (!in_array($file['name'], array( |
|
143 | 143 | 'api.class.php', |
144 | 144 | 'commonobject.class.php', |
145 | 145 | 'conf.class.php', |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | //exit; |
164 | 164 | } |
165 | 165 | |
166 | - if (preg_match('/\.class\.php/', $file['relativename']) && ! in_array($file['relativename'], array( |
|
166 | + if (preg_match('/\.class\.php/', $file['relativename']) && !in_array($file['relativename'], array( |
|
167 | 167 | 'adherents/canvas/actions_adherentcard_common.class.php', |
168 | 168 | 'contact/canvas/actions_contactcard_common.class.php', |
169 | 169 | 'compta/facture/class/facture.class.php', |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | } |
207 | 207 | } else { |
208 | 208 | // Check into Include files |
209 | - if (! in_array($file['name'], array( |
|
209 | + if (!in_array($file['name'], array( |
|
210 | 210 | 'objectline_view.tpl.php', |
211 | 211 | 'extrafieldsinexport.inc.php', |
212 | 212 | 'extrafieldsinimport.inc.php', |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | |
245 | 245 | // Check if a var_dump has been forgotten |
246 | 246 | if (!preg_match('/test\/phpunit/', $file['fullname'])) { |
247 | - if (! in_array($file['name'], array('class.nusoap_base.php'))) { |
|
247 | + if (!in_array($file['name'], array('class.nusoap_base.php'))) { |
|
248 | 248 | $ok = true; |
249 | 249 | $matches = array(); |
250 | 250 | preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER); |
@@ -382,9 +382,9 @@ discard block |
||
382 | 382 | $found = ""; |
383 | 383 | preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER); |
384 | 384 | foreach ($matches as $key => $val) { |
385 | - if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) { |
|
385 | + if (!in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) { |
|
386 | 386 | $found = $val[0]; |
387 | - $ok = false; // This will generate error |
|
387 | + $ok = false; // This will generate error |
|
388 | 388 | break; |
389 | 389 | } |
390 | 390 | //if ($reg[0] != 'db') $ok=false; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $found = ""; |
400 | 400 | preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER); |
401 | 401 | foreach ($matches as $key => $val) { |
402 | - if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) { |
|
402 | + if (!in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) { |
|
403 | 403 | $found = $val[0]; |
404 | 404 | $ok = false; |
405 | 405 | var_dump($matches); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * \remarks Class that extends all PHPunit tests. To share similare code between each test. |
26 | 26 | */ |
27 | 27 | |
28 | -global $conf,$user,$langs,$db; |
|
28 | +global $conf, $user, $langs, $db; |
|
29 | 29 | //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver |
30 | 30 | //require_once 'PHPUnit/Autoload.php'; |
31 | 31 | require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | parent::__construct($name, $data, $dataName); |
74 | 74 | |
75 | 75 | //$this->sharedFixture |
76 | - global $conf,$user,$langs,$db; |
|
76 | + global $conf, $user, $langs, $db; |
|
77 | 77 | $this->savconf = $conf; |
78 | 78 | $this->savuser = $user; |
79 | 79 | $this->savlangs = $langs; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public static function setUpBeforeClass(): void |
95 | 95 | { |
96 | - global $conf,$user,$langs,$db; |
|
96 | + global $conf, $user, $langs, $db; |
|
97 | 97 | $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. |
98 | 98 | |
99 | 99 | if ((int) getenv('PHPUNIT_DEBUG') > 0) { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | print "----- $className::$failedTestMethod failed - $argsText.".PHP_EOL; |
138 | 138 | print "Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL; |
139 | 139 | foreach ($last_lines as $line) { |
140 | - print $line . "<br>"; |
|
140 | + print $line."<br>"; |
|
141 | 141 | } |
142 | 142 | print PHP_EOL; |
143 | 143 | print "----- end of dolibarr.log for $className::$failedTestMethod".PHP_EOL; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function setUp(): void |
154 | 154 | { |
155 | - global $conf,$user,$langs,$db; |
|
155 | + global $conf, $user, $langs, $db; |
|
156 | 156 | |
157 | 157 | $conf = $this->savconf; |
158 | 158 | $user = $this->savuser; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | 'accounting' => 'Accounting', |
223 | 223 | 'agenda' => 'Agenda', |
224 | 224 | 'ai' => 'Ai', |
225 | - 'anothermodule' => null, // Not used in code, used in translations.lang |
|
225 | + 'anothermodule' => null, // Not used in code, used in translations.lang |
|
226 | 226 | 'api' => 'Api', |
227 | 227 | 'asset' => 'Asset', |
228 | 228 | 'bank' => 'Banque', |
@@ -234,32 +234,32 @@ discard block |
||
234 | 234 | 'cashdesk' => null, |
235 | 235 | 'category' => 'Categorie', |
236 | 236 | 'clicktodial' => 'ClickToDial', |
237 | - 'TBD_COLLAB' => 'Collab', // TODO: fill in proper name |
|
237 | + 'TBD_COLLAB' => 'Collab', // TODO: fill in proper name |
|
238 | 238 | 'comptabilite' => 'Comptabilite', |
239 | - 'contact' => null, // TODO: fill in proper class |
|
239 | + 'contact' => null, // TODO: fill in proper class |
|
240 | 240 | 'contract' => 'Contrat', |
241 | 241 | 'cron' => 'Cron', |
242 | 242 | 'datapolicy' => 'DataPolicy', |
243 | - 'TBD_DAV' => 'Dav', // TODO: fill in proper name |
|
243 | + 'TBD_DAV' => 'Dav', // TODO: fill in proper name |
|
244 | 244 | 'debugbar' => 'DebugBar', |
245 | 245 | 'delivery_note' => 'Expedition', |
246 | 246 | 'deplacement' => 'Deplacement', |
247 | - "TBD_DocGen" => 'DocumentGeneration', // TODO: fill in proper name |
|
247 | + "TBD_DocGen" => 'DocumentGeneration', // TODO: fill in proper name |
|
248 | 248 | 'don' => 'Don', |
249 | 249 | 'dynamicprices' => 'DynamicPrices', |
250 | 250 | 'ecm' => 'ECM', |
251 | - 'ecotax' => null, // TODO: External module ? |
|
251 | + 'ecotax' => null, // TODO: External module ? |
|
252 | 252 | 'emailcollector' => 'EmailCollector', |
253 | 253 | 'eventorganization' => 'EventOrganization', |
254 | 254 | 'expensereport' => 'ExpenseReport', |
255 | 255 | 'export' => 'Export', |
256 | - 'TBD_EXTERNALRSS' => 'ExternalRss', // TODO: fill in proper name |
|
256 | + 'TBD_EXTERNALRSS' => 'ExternalRss', // TODO: fill in proper name |
|
257 | 257 | 'externalsite' => 'ExternalSite', |
258 | 258 | 'fckeditor' => 'Fckeditor', |
259 | 259 | 'fournisseur' => 'Fournisseur', |
260 | 260 | 'ftp' => 'FTP', |
261 | - 'TBD_GEOIPMAXMIND' => 'GeoIPMaxmind', // TODO: fill in proper name |
|
262 | - 'google' => null, // External ? |
|
261 | + 'TBD_GEOIPMAXMIND' => 'GeoIPMaxmind', // TODO: fill in proper name |
|
262 | + 'google' => null, // External ? |
|
263 | 263 | 'gravatar' => 'Gravatar', |
264 | 264 | 'holiday' => 'Holiday', |
265 | 265 | 'hrm' => 'HRM', |
@@ -273,11 +273,11 @@ discard block |
||
273 | 273 | 'ldap' => 'Ldap', |
274 | 274 | 'loan' => 'Loan', |
275 | 275 | 'mailing' => 'Mailing', |
276 | - 'mailman' => null, // Same module as mailmanspip -> MailmanSpip ?? |
|
276 | + 'mailman' => null, // Same module as mailmanspip -> MailmanSpip ?? |
|
277 | 277 | 'mailmanspip' => 'MailmanSpip', |
278 | 278 | 'margin' => 'Margin', |
279 | 279 | 'member' => 'Adherent', |
280 | - 'member_type' => null, // TODO: External module ? |
|
280 | + 'member_type' => null, // TODO: External module ? |
|
281 | 281 | 'memcached' => null, // TODO: External module? |
282 | 282 | 'modulebuilder' => 'ModuleBuilder', |
283 | 283 | 'mrp' => 'Mrp', |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | 'notification' => 'Notification', |
288 | 288 | 'numberwords' => null, // Not provided by default, no module tests |
289 | 289 | 'TBD_OAUTH' => 'Oauth', // TODO: set proper name |
290 | - 'openstreetmap' => null, // External module? |
|
290 | + 'openstreetmap' => null, // External module? |
|
291 | 291 | 'opensurvey' => 'OpenSurvey', |
292 | 292 | 'order' => 'Commande', |
293 | 293 | 'partnership' => 'Partnership', |
@@ -314,8 +314,8 @@ discard block |
||
314 | 314 | 'stock' => 'Stock', |
315 | 315 | 'stocktransfer' => 'StockTransfer', |
316 | 316 | 'stripe' => 'Stripe', |
317 | - 'supplier_invoice' => null, // Special case, uses invoice |
|
318 | - 'supplier_order' => null, // Special case, uses invoice |
|
317 | + 'supplier_invoice' => null, // Special case, uses invoice |
|
318 | + 'supplier_order' => null, // Special case, uses invoice |
|
319 | 319 | 'supplier_proposal' => 'SupplierProposal', |
320 | 320 | 'syslog' => 'Syslog', |
321 | 321 | 'takepos' => 'TakePos', |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | 'webhook' => 'Webhook', |
327 | 327 | 'webportal' => 'WebPortal', |
328 | 328 | 'webservices' => 'WebServices', |
329 | - 'TBD_WS_CLIENT' => 'WebServicesClient', // TODO: set proper name |
|
329 | + 'TBD_WS_CLIENT' => 'WebServicesClient', // TODO: set proper name |
|
330 | 330 | 'website' => 'Website', |
331 | 331 | 'workflow' => 'Workflow', |
332 | 332 | 'workstation' => 'Workstation', |