@@ -545,7 +545,7 @@ discard block |
||
545 | 545 | |
546 | 546 | $i = 0; |
547 | 547 | $totalarray = array(); |
548 | - $totalarray['nbfield'] = 0; // Prevents PHP warning |
|
548 | + $totalarray['nbfield'] = 0; // Prevents PHP warning |
|
549 | 549 | while ($i < min($num, $limit)) { |
550 | 550 | $obj = $db->fetch_object($resql); |
551 | 551 | |
@@ -605,7 +605,7 @@ discard block |
||
605 | 605 | print ' - <span class="opacitymedium">' . $obj->name . '</span>'; |
606 | 606 | print "</td>\n"; |
607 | 607 | |
608 | - if (! $i) { |
|
608 | + if (!$i) { |
|
609 | 609 | $totalarray['nbfield']++; |
610 | 610 | } |
611 | 611 | } |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | print '<td class="tdoverflowmax200">'; |
616 | 616 | print $obj->rate; |
617 | 617 | print "</td>\n"; |
618 | - if (! $i) { |
|
618 | + if (!$i) { |
|
619 | 619 | $totalarray['nbfield']++; |
620 | 620 | } |
621 | 621 | } |
@@ -625,7 +625,7 @@ discard block |
||
625 | 625 | print '<td class="tdoverflowmax200">'; |
626 | 626 | print $obj->rate_indirect; |
627 | 627 | print "</td>\n"; |
628 | - if (! $i) { |
|
628 | + if (!$i) { |
|
629 | 629 | $totalarray['nbfield']++; |
630 | 630 | } |
631 | 631 | } |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | |
634 | 634 | // Fields from hook |
635 | 635 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
636 | - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook |
|
636 | + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook |
|
637 | 637 | print $hookmanager->resPrint; |
638 | 638 | |
639 | 639 | // Action |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $search_date_endday = GETPOSTINT('search_date_endday'); |
77 | 77 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
78 | 78 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
79 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
79 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
80 | 80 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
81 | 81 | $search_date_valid_startday = GETPOSTINT('search_date_valid_startday'); |
82 | 82 | $search_date_valid_startmonth = GETPOSTINT('search_date_valid_startmonth'); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $search_date_valid_endday = GETPOSTINT('search_date_valid_endday'); |
85 | 85 | $search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth'); |
86 | 86 | $search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear'); |
87 | -$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
87 | +$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
88 | 88 | $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear); |
89 | 89 | $search_type_thirdparty = GETPOSTINT("search_type_thirdparty"); |
90 | 90 | $search_montant_ht = GETPOST('search_montant_ht', 'alpha'); |
@@ -596,7 +596,7 @@ |
||
596 | 596 | $idprod = GETPOSTINT('idprod'); |
597 | 597 | } |
598 | 598 | |
599 | - $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
599 | + $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
600 | 600 | |
601 | 601 | $price_ht = price2num(GETPOST('price_ht'), 'MU', 2); |
602 | 602 | $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2); |
@@ -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 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | * \brief Main page for ECM section area |
25 | 25 | */ |
26 | 26 | |
27 | -if (! defined('DISABLE_JS_GRAHP')) { |
|
27 | +if (!defined('DISABLE_JS_GRAHP')) { |
|
28 | 28 | define('DISABLE_JS_GRAPH', 1); |
29 | 29 | } |
30 | 30 |
@@ -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), |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday'); |
67 | 67 | $search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth'); |
68 | 68 | $search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear'); |
69 | -$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
69 | +$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
70 | 70 | $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear); |
71 | 71 | $search_date_create_startday = GETPOSTINT('search_date_create_startday'); |
72 | 72 | $search_date_create_startmonth = GETPOSTINT('search_date_create_startmonth'); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $search_date_create_endday = GETPOSTINT('search_date_create_endday'); |
75 | 75 | $search_date_create_endmonth = GETPOSTINT('search_date_create_endmonth'); |
76 | 76 | $search_date_create_endyear = GETPOSTINT('search_date_create_endyear'); |
77 | -$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
77 | +$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
78 | 78 | $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear); |
79 | 79 | $search_billed = GETPOSTINT("search_billed"); |
80 | 80 | $search_status = GETPOST('search_status', 'intcomma'); |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | // if the VAT reverse-charge is activated by default in supplier card to resume the information |
333 | 333 | $objecttmp->vat_reverse_charge = $soc->vat_reverse_charge; |
334 | 334 | |
335 | - $objecttmp->fk_project = $rcp->fk_project; |
|
335 | + $objecttmp->fk_project = $rcp->fk_project; |
|
336 | 336 | //$objecttmp->multicurrency_code = $rcp->multicurrency_code; |
337 | 337 | if (empty($createbills_onebythird)) { |
338 | 338 | $objecttmp->ref_supplier = $rcp->ref; |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | } |
366 | 366 | } |
367 | 367 | |
368 | - $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
368 | + $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
369 | 369 | |
370 | 370 | //var_dump($objecttmp->error);exit; |
371 | 371 | if ($res > 0) { |
@@ -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 . '">'; |
@@ -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 |