@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | |
| 191 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 191 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 192 | 192 | /** |
| 193 | 193 | * Clean sensible object datas |
| 194 | 194 | * |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | protected function _cleanObjectDatas($object) |
| 199 | 199 | { |
| 200 | - // phpcs:enable |
|
| 200 | + // phpcs:enable |
|
| 201 | 201 | $object = parent::_cleanObjectDatas($object); |
| 202 | 202 | |
| 203 | 203 | unset($object->name); |
@@ -235,10 +235,10 @@ |
||
| 235 | 235 | $id = $ecmdirtmp->create($user); |
| 236 | 236 | if ($id > 0) { |
| 237 | 237 | $newdirsql = array('id' => $id, |
| 238 | - 'id_mere' => $ecmdirtmp->fk_parent, |
|
| 239 | - 'label' => $ecmdirtmp->label, |
|
| 240 | - 'description' => $ecmdirtmp->description, |
|
| 241 | - 'fullrelativename' => $relativepathmissing); |
|
| 238 | + 'id_mere' => $ecmdirtmp->fk_parent, |
|
| 239 | + 'label' => $ecmdirtmp->label, |
|
| 240 | + 'description' => $ecmdirtmp->description, |
|
| 241 | + 'fullrelativename' => $relativepathmissing); |
|
| 242 | 242 | $sqltree[] = $newdirsql; // We complete fulltree for following loops |
| 243 | 243 | //var_dump($sqltree); |
| 244 | 244 | $adirwascreated = 1; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if (empty($action) && $file_manager) { |
| 54 | 54 | $action = 'file_manager'; |
| 55 | 55 | } |
| 56 | -$pageid = GETPOSTINT('pageid'); |
|
| 56 | +$pageid = GETPOSTINT('pageid'); |
|
| 57 | 57 | |
| 58 | 58 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
| 59 | 59 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if ($sortorder) { |
| 120 | 120 | $backtopage .= '&sortorder=' . urlencode($sortorder); |
| 121 | 121 | } |
| 122 | -include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
| 122 | +include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
| 123 | 123 | |
| 124 | 124 | $backtopage = $savbacktopage; |
| 125 | 125 | |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | return $this->LibStatut($this->status, $mode); |
| 953 | 953 | } |
| 954 | 954 | |
| 955 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 955 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 956 | 956 | /** |
| 957 | 957 | * Return the status |
| 958 | 958 | * |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | */ |
| 963 | 963 | public static function LibStatut($status, $mode = 0) |
| 964 | 964 | { |
| 965 | - // phpcs:enable |
|
| 965 | + // phpcs:enable |
|
| 966 | 966 | global $langs; |
| 967 | 967 | return ''; |
| 968 | 968 | } |
@@ -163,16 +163,16 @@ |
||
| 163 | 163 | 'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash of file content"), |
| 164 | 164 | 'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash for file sharing"), |
| 165 | 165 | 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1), |
| 166 | - 'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "relative to dolibarr document dir. Example module/def"), |
|
| 167 | - 'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "file name only without any directory"), |
|
| 168 | - 'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "Source object type ('proposal', 'invoice', ...)"), |
|
| 166 | + 'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "relative to dolibarr document dir. Example module/def"), |
|
| 167 | + 'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "file name only without any directory"), |
|
| 168 | + 'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "Source object type ('proposal', 'invoice', ...)"), |
|
| 169 | 169 | 'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"), |
| 170 | - 'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "full path of original filename, when file is uploaded from a local computer"), |
|
| 170 | + 'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "full path of original filename, when file is uploaded from a local computer"), |
|
| 171 | 171 | 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110), |
| 172 | - 'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."), |
|
| 172 | + 'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."), |
|
| 173 | 173 | 'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"), |
| 174 | 174 | 'position' => array('type' => 'integer', 'label' => 'Position', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"), |
| 175 | - 'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "'generated' or 'uploaded'"), |
|
| 175 | + 'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "'generated' or 'uploaded'"), |
|
| 176 | 176 | 'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "for stocking other parameters with json format"), |
| 177 | 177 | 'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170), |
| 178 | 178 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175), |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | return $ret; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 561 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 562 | 562 | /** |
| 563 | 563 | * Load this->motherof that is array(id_son=>id_parent, ...) |
| 564 | 564 | * |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | */ |
| 567 | 567 | public function load_motherof() |
| 568 | 568 | { |
| 569 | - // phpcs:enable |
|
| 569 | + // phpcs:enable |
|
| 570 | 570 | global $conf; |
| 571 | 571 | |
| 572 | 572 | $this->motherof = array(); |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | return $this->LibStatut($this->status, $mode); |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 606 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 607 | 607 | /** |
| 608 | 608 | * Return the status |
| 609 | 609 | * |
@@ -613,13 +613,13 @@ discard block |
||
| 613 | 613 | */ |
| 614 | 614 | public static function LibStatut($status, $mode = 0) |
| 615 | 615 | { |
| 616 | - // phpcs:enable |
|
| 616 | + // phpcs:enable |
|
| 617 | 617 | global $langs; |
| 618 | 618 | return ''; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | |
| 622 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 622 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 623 | 623 | /** |
| 624 | 624 | * Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée |
| 625 | 625 | * Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec: |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | */ |
| 642 | 642 | public function get_full_arbo($force = 0) |
| 643 | 643 | { |
| 644 | - // phpcs:enable |
|
| 644 | + // phpcs:enable |
|
| 645 | 645 | global $conf; |
| 646 | 646 | |
| 647 | 647 | if (empty($force) && !empty($this->full_arbo_loaded)) { |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 792 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 793 | 793 | /** |
| 794 | 794 | * Call trigger based on this instance. |
| 795 | 795 | * We implement it here because this class doe not extend CommonObject. |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | */ |
| 805 | 805 | public function call_trigger($triggerName, $user) |
| 806 | 806 | { |
| 807 | - // phpcs:enable |
|
| 807 | + // phpcs:enable |
|
| 808 | 808 | global $langs, $conf; |
| 809 | 809 | |
| 810 | 810 | include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; |
@@ -966,7 +966,7 @@ |
||
| 966 | 966 | /** |
| 967 | 967 | * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that |
| 968 | 968 | * extrafields from HTTP query can be assigned to the correct dispatch line |
| 969 | - */ |
|
| 969 | + */ |
|
| 970 | 970 | $suffix2numAsked = array(); |
| 971 | 971 | $dispatchLines = array(); |
| 972 | 972 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | |
| 344 | 344 | // Loop lines to calculate $totalqty |
| 345 | 345 | for ($i = 1; $i <= $num; $i++) { |
| 346 | - $idl = "idl" . $i; // id line source |
|
| 346 | + $idl = "idl" . $i; // id line source |
|
| 347 | 347 | |
| 348 | 348 | //$sub_qty = array(); |
| 349 | 349 | //$subtotalqty = 0; |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | //$j = 0; |
| 352 | 352 | //$batch = "batchl".$i."_0"; |
| 353 | 353 | //$stockLocation = "ent1".$i."_0"; |
| 354 | - $qty = "qtyl" . $i; // qty |
|
| 354 | + $qty = "qtyl" . $i; // qty |
|
| 355 | 355 | |
| 356 | 356 | //reception line for product with no batch management and no multiple stock location |
| 357 | 357 | if (GETPOST($qty, 'alpha') > 0) { |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | |
| 366 | 366 | if ($totalqty > 0) { // There is at least one thing to ship |
| 367 | 367 | for ($i = 1; $i <= $num; $i++) { |
| 368 | - $idl = "idl" . $i; // id line source |
|
| 368 | + $idl = "idl" . $i; // id line source |
|
| 369 | 369 | $lineToTest = ''; |
| 370 | 370 | $lineId = GETPOSTINT($idl); |
| 371 | 371 | foreach ($objectsrc->lines as $linesrc) { |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | |
| 1145 | 1145 | print '<input type="hidden" name="productl' . $indiceAsked . '" value="' . $line->fk_product . '">'; |
| 1146 | 1146 | |
| 1147 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1147 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1148 | 1148 | print '<input type="hidden" name="productid' . $indiceAsked . '" value="' . $line->fk_product . '">'; |
| 1149 | 1149 | |
| 1150 | 1150 | // Show product and description |
@@ -1166,7 +1166,7 @@ discard block |
||
| 1166 | 1166 | print '</td>'; |
| 1167 | 1167 | } else { |
| 1168 | 1168 | print "<td>"; |
| 1169 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1169 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1170 | 1170 | if ($type == 1) { |
| 1171 | 1171 | $text = img_object($langs->trans('Service'), 'service'); |
| 1172 | 1172 | } else { |
@@ -1195,7 +1195,7 @@ discard block |
||
| 1195 | 1195 | |
| 1196 | 1196 | // Qty in source purchase order line |
| 1197 | 1197 | print '<td class="center">'; |
| 1198 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1198 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1199 | 1199 | print $line->qty; |
| 1200 | 1200 | } |
| 1201 | 1201 | print '<input type="hidden" name="fk_commandefournisseurdet' . $indiceAsked . '" value="' . $line->id . '">'; |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | // Qty already received |
| 1208 | 1208 | print '<td class="center">'; |
| 1209 | 1209 | $quantityDelivered = $objectsrc->receptions[$line->id]; |
| 1210 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1210 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1211 | 1211 | print $quantityDelivered; |
| 1212 | 1212 | } |
| 1213 | 1213 | print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">'; |
@@ -1184,7 +1184,7 @@ discard block |
||
| 1184 | 1184 | } |
| 1185 | 1185 | } |
| 1186 | 1186 | |
| 1187 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1187 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1188 | 1188 | /** |
| 1189 | 1189 | * Load lines |
| 1190 | 1190 | * |
@@ -1192,7 +1192,7 @@ discard block |
||
| 1192 | 1192 | */ |
| 1193 | 1193 | public function fetch_lines() |
| 1194 | 1194 | { |
| 1195 | - // phpcs:enable |
|
| 1195 | + // phpcs:enable |
|
| 1196 | 1196 | $this->lines = array(); |
| 1197 | 1197 | |
| 1198 | 1198 | require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.dispatch.class.php'; |
@@ -1334,7 +1334,7 @@ discard block |
||
| 1334 | 1334 | return $this->LibStatut($this->statut, $mode); |
| 1335 | 1335 | } |
| 1336 | 1336 | |
| 1337 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1337 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1338 | 1338 | /** |
| 1339 | 1339 | * Return label of a status |
| 1340 | 1340 | * |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | */ |
| 1345 | 1345 | public function LibStatut($status, $mode) |
| 1346 | 1346 | { |
| 1347 | - // phpcs:enable |
|
| 1347 | + // phpcs:enable |
|
| 1348 | 1348 | global $langs; |
| 1349 | 1349 | |
| 1350 | 1350 | // List of long language codes for status |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | } |
| 1507 | 1507 | } |
| 1508 | 1508 | |
| 1509 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1509 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1510 | 1510 | /** |
| 1511 | 1511 | * Fetch deliveries method and return an array. Load array this->meths(rowid=>label). |
| 1512 | 1512 | * |
@@ -1514,7 +1514,7 @@ discard block |
||
| 1514 | 1514 | */ |
| 1515 | 1515 | public function fetch_delivery_methods() |
| 1516 | 1516 | { |
| 1517 | - // phpcs:enable |
|
| 1517 | + // phpcs:enable |
|
| 1518 | 1518 | global $langs; |
| 1519 | 1519 | $this->meths = array(); |
| 1520 | 1520 | |
@@ -1532,7 +1532,7 @@ discard block |
||
| 1532 | 1532 | } |
| 1533 | 1533 | } |
| 1534 | 1534 | |
| 1535 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1535 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 1536 | 1536 | /** |
| 1537 | 1537 | * Fetch all deliveries method and return an array. Load array this->listmeths. |
| 1538 | 1538 | * |
@@ -1541,7 +1541,7 @@ discard block |
||
| 1541 | 1541 | */ |
| 1542 | 1542 | public function list_delivery_methods($id = 0) |
| 1543 | 1543 | { |
| 1544 | - // phpcs:enable |
|
| 1544 | + // phpcs:enable |
|
| 1545 | 1545 | global $langs; |
| 1546 | 1546 | |
| 1547 | 1547 | $this->listmeths = array(); |
@@ -736,9 +736,9 @@ discard block |
||
| 736 | 736 | if (empty($this->origin_object->lines)) { |
| 737 | 737 | $res = $this->origin_object->fetch_lines(); |
| 738 | 738 | if ($this->origin_object instanceof CommandeFournisseur) { |
| 739 | - $this->commandeFournisseur = $this->origin_object; // deprecated |
|
| 739 | + $this->commandeFournisseur = $this->origin_object; // deprecated |
|
| 740 | 740 | } else { |
| 741 | - $this->commandeFournisseur = null; // deprecated |
|
| 741 | + $this->commandeFournisseur = null; // deprecated |
|
| 742 | 742 | } |
| 743 | 743 | if ($res < 0) { |
| 744 | 744 | return $res; |
@@ -1358,7 +1358,7 @@ discard block |
||
| 1358 | 1358 | if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) { |
| 1359 | 1359 | $this->labelStatus[1] = 'StatusReceptionValidatedToReceive'; |
| 1360 | 1360 | } |
| 1361 | - $this->labelStatus[2] = 'StatusReceptionProcessed'; |
|
| 1361 | + $this->labelStatus[2] = 'StatusReceptionProcessed'; |
|
| 1362 | 1362 | |
| 1363 | 1363 | // List of short language codes for status |
| 1364 | 1364 | $this->labelStatusShort[-1] = 'StatusReceptionCanceledShort'; |
@@ -1454,7 +1454,7 @@ discard block |
||
| 1454 | 1454 | $this->origin_id = 1; |
| 1455 | 1455 | $this->origin = 'commande'; |
| 1456 | 1456 | $this->origin_object = $order; |
| 1457 | - $this->commandeFournisseur = $order; // deprecated |
|
| 1457 | + $this->commandeFournisseur = $order; // deprecated |
|
| 1458 | 1458 | |
| 1459 | 1459 | $this->note_private = 'Private note'; |
| 1460 | 1460 | $this->note_public = 'Public note'; |
@@ -1464,7 +1464,7 @@ discard block |
||
| 1464 | 1464 | while ($xnbp < $nbp) { |
| 1465 | 1465 | $line = new CommandeFournisseurDispatch($this->db); |
| 1466 | 1466 | $line->desc = $langs->trans("Description") . " " . $xnbp; |
| 1467 | - $line->libelle = $langs->trans("Description") . " " . $xnbp; // deprecated |
|
| 1467 | + $line->libelle = $langs->trans("Description") . " " . $xnbp; // deprecated |
|
| 1468 | 1468 | $line->label = $langs->trans("Description") . " " . $xnbp; |
| 1469 | 1469 | $line->qty = 10; |
| 1470 | 1470 | |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | - use Luracast\Restler\RestException; |
|
| 20 | + use Luracast\Restler\RestException; |
|
| 21 | 21 | |
| 22 | - require_once DOL_DOCUMENT_ROOT . '/reception/class/reception.class.php'; |
|
| 22 | + require_once DOL_DOCUMENT_ROOT . '/reception/class/reception.class.php'; |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * API class for receptions |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | public $reception; |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * Constructor |
|
| 47 | + * Constructor |
|
| 48 | 48 | */ |
| 49 | 49 | public function __construct() |
| 50 | 50 | { |
@@ -622,15 +622,15 @@ discard block |
||
| 622 | 622 | */ |
| 623 | 623 | |
| 624 | 624 | /** |
| 625 | - * Close a reception (Classify it as "Delivered") |
|
| 626 | - * |
|
| 627 | - * @param int $id Reception ID |
|
| 628 | - * @param int $notrigger Disabled triggers |
|
| 629 | - * |
|
| 630 | - * @url POST {id}/close |
|
| 631 | - * |
|
| 632 | - * @return Object |
|
| 633 | - */ |
|
| 625 | + * Close a reception (Classify it as "Delivered") |
|
| 626 | + * |
|
| 627 | + * @param int $id Reception ID |
|
| 628 | + * @param int $notrigger Disabled triggers |
|
| 629 | + * |
|
| 630 | + * @url POST {id}/close |
|
| 631 | + * |
|
| 632 | + * @return Object |
|
| 633 | + */ |
|
| 634 | 634 | public function close($id, $notrigger = 0) |
| 635 | 635 | { |
| 636 | 636 | if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) { |
@@ -662,7 +662,7 @@ discard block |
||
| 662 | 662 | return $this->_cleanObjectDatas($this->reception); |
| 663 | 663 | } |
| 664 | 664 | |
| 665 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 665 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 666 | 666 | /** |
| 667 | 667 | * Clean sensible object datas |
| 668 | 668 | * |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | */ |
| 672 | 672 | protected function _cleanObjectDatas($object) |
| 673 | 673 | { |
| 674 | - // phpcs:enable |
|
| 674 | + // phpcs:enable |
|
| 675 | 675 | $object = parent::_cleanObjectDatas($object); |
| 676 | 676 | |
| 677 | 677 | unset($object->thirdparty); // id already returned |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 201 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 202 | 202 | /** |
| 203 | 203 | * Return tree of Dolistore categories. $this->categories must have been loaded before. |
| 204 | 204 | * |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | public function get_categories($parent = 0) |
| 209 | 209 | { |
| 210 | - // phpcs:enable |
|
| 210 | + // phpcs:enable |
|
| 211 | 211 | if (!isset($this->categories)) { |
| 212 | 212 | die('not possible'); |
| 213 | 213 | } |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 248 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 249 | 249 | /** |
| 250 | 250 | * Return list of product formatted for output |
| 251 | 251 | * |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | public function get_products() |
| 255 | 255 | { |
| 256 | - // phpcs:enable |
|
| 256 | + // phpcs:enable |
|
| 257 | 257 | global $langs, $conf; |
| 258 | 258 | $html = ""; |
| 259 | 259 | $last_month = time() - (30 * 24 * 60 * 60); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | return $html; |
| 343 | 343 | } |
| 344 | 344 | |
| 345 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 345 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 346 | 346 | /** |
| 347 | 347 | * get previous link |
| 348 | 348 | * |
@@ -351,11 +351,11 @@ discard block |
||
| 351 | 351 | */ |
| 352 | 352 | public function get_previous_link($text = '<<') |
| 353 | 353 | { |
| 354 | - // phpcs:enable |
|
| 354 | + // phpcs:enable |
|
| 355 | 355 | return '<a href="' . $this->get_previous_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>'; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 358 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 359 | 359 | /** |
| 360 | 360 | * get next link |
| 361 | 361 | * |
@@ -364,11 +364,11 @@ discard block |
||
| 364 | 364 | */ |
| 365 | 365 | public function get_next_link($text = '>>') |
| 366 | 366 | { |
| 367 | - // phpcs:enable |
|
| 367 | + // phpcs:enable |
|
| 368 | 368 | return '<a href="' . $this->get_next_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>'; |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 371 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 372 | 372 | /** |
| 373 | 373 | * get previous url |
| 374 | 374 | * |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | */ |
| 377 | 377 | public function get_previous_url() |
| 378 | 378 | { |
| 379 | - // phpcs:enable |
|
| 379 | + // phpcs:enable |
|
| 380 | 380 | $param_array = array(); |
| 381 | 381 | if ($this->start < $this->per_page) { |
| 382 | 382 | $sub = 0; |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | return $this->url . "&" . $param; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 395 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 396 | 396 | /** |
| 397 | 397 | * get next url |
| 398 | 398 | * |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | public function get_next_url() |
| 402 | 402 | { |
| 403 | - // phpcs:enable |
|
| 403 | + // phpcs:enable |
|
| 404 | 404 | $param_array = array(); |
| 405 | 405 | if (count($this->products) < $this->per_page) { |
| 406 | 406 | $add = 0; |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | return $this->url . "&" . $param; |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 419 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 420 | 420 | /** |
| 421 | 421 | * version compare |
| 422 | 422 | * |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | */ |
| 427 | 427 | public function version_compare($v1, $v2) |
| 428 | 428 | { |
| 429 | - // phpcs:enable |
|
| 429 | + // phpcs:enable |
|
| 430 | 430 | $v1 = explode('.', $v1); |
| 431 | 431 | $v2 = explode('.', $v2); |
| 432 | 432 | $ret = 0; |
@@ -324,12 +324,12 @@ |
||
| 324 | 324 | //output template |
| 325 | 325 | $html .= '<tr class="app oddeven ' . dol_escape_htmltag($compatible) . '">'; |
| 326 | 326 | $html .= '<td class="center" width="210"><div class="newAppParent">'; |
| 327 | - $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html |
|
| 327 | + $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html |
|
| 328 | 328 | $html .= '</div></td>'; |
| 329 | 329 | $html .= '<td class="margeCote"><h2 class="appTitle">'; |
| 330 | 330 | $html .= dol_escape_htmltag($product->name->language[$this->lang - 1]); |
| 331 | 331 | $html .= '<br><small>'; |
| 332 | - $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
| 332 | + $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
| 333 | 333 | $html .= '</small></h2>'; |
| 334 | 334 | $html .= '<small> ' . dol_print_date(dol_stringtotime($product->date_upd), 'dayhour') . ' - ' . $langs->trans('Ref') . ': ' . dol_escape_htmltag($product->reference) . ' - ' . dol_escape_htmltag($langs->trans('Id')) . ': ' . ((int) $product->id) . '</small><br><br>' . dol_escape_htmltag($product->description_short->language[$this->lang - 1]) . '</td>'; |
| 335 | 335 | // do not load if display none |
@@ -189,7 +189,7 @@ |
||
| 189 | 189 | <div class="tagtd center noborderbottom"> |
| 190 | 190 | <input type="submit" id="add-customer-contact" class="button small" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) { |
| 191 | 191 | echo ' disabled'; |
| 192 | - } ?>> |
|
| 192 | + } ?>> |
|
| 193 | 193 | </div> |
| 194 | 194 | </form> |
| 195 | 195 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $module = $object->element; |
| 41 | 41 | |
| 42 | 42 | // Special cases |
| 43 | -if (isset($permissiontoadd) && ! isset($permission)) { |
|
| 43 | +if (isset($permissiontoadd) && !isset($permission)) { |
|
| 44 | 44 | $permission = $permissiontoadd; |
| 45 | 45 | } |
| 46 | 46 | // TODO Remove this section. We already got $permissiontoadd. |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | <div class="tagtd nowrap noborderbottom"> |
| 165 | 165 | <?php |
| 166 | 166 | $selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid); |
| 167 | - $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); // This also print the select component?> |
|
| 167 | + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); // This also print the select component?> |
|
| 168 | 168 | </div> |
| 169 | 169 | <div class="tagtd noborderbottom minwidth500imp"> |
| 170 | 170 | <?php |