@@ -961,7 +961,7 @@ |
||
| 961 | 961 | if (!empty($activefilter)) { // Use a predefined trusted filter (defined into setup by admin). |
| 962 | 962 | if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) { |
| 963 | 963 | $filter = '('.$this->filter.')'; |
| 964 | - } elseif (((string) $activefilter == 'group') && $this->filtergroup ) { |
|
| 964 | + } elseif (((string) $activefilter == 'group') && $this->filtergroup) { |
|
| 965 | 965 | $filter = '('.$this->filtergroup.')'; |
| 966 | 966 | } elseif (((string) $activefilter == 'member') && $this->filter) { |
| 967 | 967 | $filter = '('.$this->filtermember.')'; |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | /** |
| 99 | 99 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
| 100 | 100 | */ |
| 101 | - public $fields=array( |
|
| 101 | + public $fields = array( |
|
| 102 | 102 | 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10), |
| 103 | 103 | 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1), |
| 104 | 104 | 'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20), |
@@ -1336,7 +1336,9 @@ discard block |
||
| 1336 | 1336 | $deliverableQty = min($quantityToBeDelivered, $stock); |
| 1337 | 1337 | } |
| 1338 | 1338 | |
| 1339 | - if ($deliverableQty < 0) $deliverableQty = 0; |
|
| 1339 | + if ($deliverableQty < 0) { |
|
| 1340 | + $deliverableQty = 0; |
|
| 1341 | + } |
|
| 1340 | 1342 | |
| 1341 | 1343 | $tooltip = ''; |
| 1342 | 1344 | if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) { |
@@ -1435,7 +1437,9 @@ discard block |
||
| 1435 | 1437 | $deliverableQty = min($quantityToBeDelivered, $batchStock); |
| 1436 | 1438 | } |
| 1437 | 1439 | |
| 1438 | - if ($deliverableQty < 0) $deliverableQty = 0; |
|
| 1440 | + if ($deliverableQty < 0) { |
|
| 1441 | + $deliverableQty = 0; |
|
| 1442 | + } |
|
| 1439 | 1443 | |
| 1440 | 1444 | $inputName = 'qtyl'.$indiceAsked.'_'.$subj; |
| 1441 | 1445 | if (GETPOSTISSET($inputName)) { |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | $stockLocation = "ent1".$i."_0"; |
| 274 | 274 | $qty = "qtyl".$i; |
| 275 | 275 | |
| 276 | - $is_batch_or_serial=0; |
|
| 276 | + $is_batch_or_serial = 0; |
|
| 277 | 277 | if (!empty($objectsrc->lines[$i]->fk_product)) { |
| 278 | 278 | $resultFetch = $product->fetch($objectsrc->lines[$i]->fk_product, '', '', '', 1, 1, 1); |
| 279 | 279 | if ($resultFetch < 0) { |
@@ -299,9 +299,9 @@ discard block |
||
| 299 | 299 | //var_dump($sub_qty[$j]['id_batch']); |
| 300 | 300 | |
| 301 | 301 | //var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']); |
| 302 | - if ($is_batch_or_serial==2 && $sub_qty[$j]['q']>1) { |
|
| 302 | + if ($is_batch_or_serial == 2 && $sub_qty[$j]['q'] > 1) { |
|
| 303 | 303 | setEventMessages($langs->trans("TooManyQtyForSerialNumber", $product->ref, ''), null, 'errors'); |
| 304 | - $totalqty=0; |
|
| 304 | + $totalqty = 0; |
|
| 305 | 305 | break 2; |
| 306 | 306 | } |
| 307 | 307 | $j++; |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | |
| 351 | 351 | // check qty shipped not greater than ordered |
| 352 | 352 | if (getDolGlobalInt("MAIN_DONT_SHIP_MORE_THAN_ORDERED") && $subtotalqty > $objectsrc->lines[$i]->qty) { |
| 353 | - setEventMessages($langs->trans("ErrorTooMuchShipped", $i+1), null, 'errors'); |
|
| 353 | + setEventMessages($langs->trans("ErrorTooMuchShipped", $i + 1), null, 'errors'); |
|
| 354 | 354 | $error++; |
| 355 | 355 | continue; |
| 356 | 356 | } |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | setEventMessages($line->error, $line->errors, 'errors'); |
| 679 | 679 | $error++; |
| 680 | 680 | } else { |
| 681 | - $update_done=true; |
|
| 681 | + $update_done = true; |
|
| 682 | 682 | } |
| 683 | 683 | } else { |
| 684 | 684 | setEventMessages($lotStock->error, $lotStock->errors, 'errors'); |
@@ -722,7 +722,7 @@ discard block |
||
| 722 | 722 | setEventMessages($line->error, $line->errors, 'errors'); |
| 723 | 723 | $error++; |
| 724 | 724 | } else { |
| 725 | - $update_done=true; |
|
| 725 | + $update_done = true; |
|
| 726 | 726 | } |
| 727 | 727 | } else { |
| 728 | 728 | setEventMessages($line->error, $line->errors, 'errors'); |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | setEventMessages($object->error, $object->errors, 'errors'); |
| 742 | 742 | $error++; |
| 743 | 743 | } else { |
| 744 | - $update_done=true; |
|
| 744 | + $update_done = true; |
|
| 745 | 745 | } |
| 746 | 746 | } |
| 747 | 747 | } else { |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | setEventMessages($line->error, $line->errors, 'errors'); |
| 781 | 781 | $error++; |
| 782 | 782 | } else { |
| 783 | - $update_done=true; |
|
| 783 | + $update_done = true; |
|
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | 786 | unset($_POST[$stockLocation]); |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | setEventMessages($line->error, $line->errors, 'errors'); |
| 797 | 797 | $error++; |
| 798 | 798 | } else { |
| 799 | - $update_done=true; |
|
| 799 | + $update_done = true; |
|
| 800 | 800 | } |
| 801 | 801 | unset($_POST[$qty]); |
| 802 | 802 | } |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | setEventMessages($line->error, $line->errors, 'errors'); |
| 811 | 811 | $error++; |
| 812 | 812 | } else { |
| 813 | - $update_done=true; |
|
| 813 | + $update_done = true; |
|
| 814 | 814 | } |
| 815 | 815 | unset($_POST[$qty]); |
| 816 | 816 | } |
@@ -1546,7 +1546,7 @@ discard block |
||
| 1546 | 1546 | $nbofsuggested = 0; |
| 1547 | 1547 | foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) { |
| 1548 | 1548 | if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) { |
| 1549 | - $nbofsuggested+=count($stock_warehouse->detail_batch); |
|
| 1549 | + $nbofsuggested += count($stock_warehouse->detail_batch); |
|
| 1550 | 1550 | } |
| 1551 | 1551 | } |
| 1552 | 1552 | |
@@ -1587,7 +1587,7 @@ discard block |
||
| 1587 | 1587 | $tooltipClass = ' classfortooltip'; |
| 1588 | 1588 | $tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)]; |
| 1589 | 1589 | } else { |
| 1590 | - $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0 ; |
|
| 1590 | + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0; |
|
| 1591 | 1591 | } |
| 1592 | 1592 | $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)]; |
| 1593 | 1593 | |
@@ -2351,7 +2351,7 @@ discard block |
||
| 2351 | 2351 | // only show lot numbers from src warehouse when shipping from multiple warehouses |
| 2352 | 2352 | $line->fetch($detail_batch->fk_expeditiondet); |
| 2353 | 2353 | } |
| 2354 | - $entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id; |
|
| 2354 | + $entrepot_id = !empty($detail_batch->entrepot_id) ? $detail_batch->entrepot_id : $lines[$i]->entrepot_id; |
|
| 2355 | 2355 | print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>'; |
| 2356 | 2356 | print '</tr>'; |
| 2357 | 2357 | } |
@@ -2568,7 +2568,7 @@ discard block |
||
| 2568 | 2568 | || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate))) { |
| 2569 | 2569 | print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, ''); |
| 2570 | 2570 | } else { |
| 2571 | - print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 2571 | + print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 2572 | 2572 | } |
| 2573 | 2573 | } |
| 2574 | 2574 | |
@@ -2595,7 +2595,7 @@ discard block |
||
| 2595 | 2595 | if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send) { |
| 2596 | 2596 | print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', ''); |
| 2597 | 2597 | } else { |
| 2598 | - print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 2598 | + print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 2599 | 2599 | } |
| 2600 | 2600 | } |
| 2601 | 2601 | } |
@@ -2623,7 +2623,7 @@ discard block |
||
| 2623 | 2623 | $label = "ClassifyBilled"; |
| 2624 | 2624 | $paramaction = 'classifybilled'; |
| 2625 | 2625 | } |
| 2626 | - print dolGetButtonAction('', $langs->trans($label), 'default', $_SERVER["PHP_SELF"].'?action='. $paramaction .'&token='.newToken().'&id='.$object->id, ''); |
|
| 2626 | + print dolGetButtonAction('', $langs->trans($label), 'default', $_SERVER["PHP_SELF"].'?action='.$paramaction.'&token='.newToken().'&id='.$object->id, ''); |
|
| 2627 | 2627 | } |
| 2628 | 2628 | } |
| 2629 | 2629 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | */ |
| 302 | 302 | /* END MODULEBUILDER TOPMENU */ |
| 303 | 303 | |
| 304 | - $this->menu[$r++]=array( |
|
| 304 | + $this->menu[$r++] = array( |
|
| 305 | 305 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
| 306 | 306 | 'fk_menu'=>'fk_mainmenu=ticket', |
| 307 | 307 | // This is a Left menu entry |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | // 0=Menu for internal users, 1=external users, 2=both |
| 323 | 323 | 'user'=>2, |
| 324 | 324 | ); |
| 325 | - $this->menu[$r++]=array( |
|
| 325 | + $this->menu[$r++] = array( |
|
| 326 | 326 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
| 327 | 327 | 'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord', |
| 328 | 328 | // This is a Left menu entry |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | // 0=Menu for internal users, 1=external users, 2=both |
| 343 | 343 | 'user'=>2, |
| 344 | 344 | ); |
| 345 | - $this->menu[$r++]=array( |
|
| 345 | + $this->menu[$r++] = array( |
|
| 346 | 346 | // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
| 347 | 347 | 'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord', |
| 348 | 348 | // This is a Left menu entry |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
| 65 | 65 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
| 66 | 66 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
| 67 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 67 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 68 | 68 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
| 69 | 69 | $search_company = GETPOST("search_company", 'alpha'); |
| 70 | 70 | $search_paymenttype = GETPOST("search_paymenttype"); |
@@ -227,10 +227,10 @@ discard block |
||
| 227 | 227 | $sql .= natural_search('p.ref', $search_ref); |
| 228 | 228 | } |
| 229 | 229 | if ($search_date_start) { |
| 230 | - $sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'"; |
|
| 230 | + $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'"; |
|
| 231 | 231 | } |
| 232 | 232 | if ($search_date_end) { |
| 233 | - $sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'"; |
|
| 233 | + $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'"; |
|
| 234 | 234 | } |
| 235 | 235 | if ($search_account > 0) { |
| 236 | 236 | $sql .= " AND b.fk_account=".((int) $search_account); |
@@ -51,7 +51,9 @@ |
||
| 51 | 51 | $userid = GETPOST('userid', 'int'); |
| 52 | 52 | |
| 53 | 53 | // Security check |
| 54 | -if ($user->socid) $socid = $user->socid; |
|
| 54 | +if ($user->socid) { |
|
| 55 | + $socid = $user->socid; |
|
| 56 | +} |
|
| 55 | 57 | $result = restrictedArea($user, 'facture', $facid, ''); |
| 56 | 58 | |
| 57 | 59 | $search_ref = GETPOST("search_ref", "alpha"); |
@@ -404,7 +404,7 @@ |
||
| 404 | 404 | include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; |
| 405 | 405 | // End add extra fields object |
| 406 | 406 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
| 407 | - $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'societe as s'; |
|
| 407 | + $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'societe as s'; |
|
| 408 | 408 | if (is_object($user) && empty($user->rights->societe->client->voir)) { |
| 409 | 409 | $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; |
| 410 | 410 | } |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>'; |
| 108 | 108 | } else { |
| 109 | 109 | $disabled = 0; |
| 110 | - if (!$obj->fk_statut > 0 && ! $draftonly) { |
|
| 110 | + if (!$obj->fk_statut > 0 && !$draftonly) { |
|
| 111 | 111 | $disabled = 1; |
| 112 | 112 | $labeltoshow .= ' ('.$langs->trans("Draft").')'; |
| 113 | 113 | } |
@@ -81,7 +81,9 @@ discard block |
||
| 81 | 81 | $sql .= " AND f.fk_soc = ".((int) $socid); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - if ($draftonly) $sql .= " AND f.fk_statut = 0"; |
|
| 84 | + if ($draftonly) { |
|
| 85 | + $sql .= " AND f.fk_statut = 0"; |
|
| 86 | + } |
|
| 85 | 87 | |
| 86 | 88 | dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG); |
| 87 | 89 | $resql = $this->db->query($sql); |
@@ -89,8 +91,11 @@ discard block |
||
| 89 | 91 | $out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">'; |
| 90 | 92 | if ($showempty) { |
| 91 | 93 | $out .= '<option value="0">'; |
| 92 | - if (!is_numeric($showempty)) $out .= $showempty; |
|
| 93 | - else $out .= ' '; |
|
| 94 | + if (!is_numeric($showempty)) { |
|
| 95 | + $out .= $showempty; |
|
| 96 | + } else { |
|
| 97 | + $out .= ' '; |
|
| 98 | + } |
|
| 94 | 99 | $out .= '</option>'; |
| 95 | 100 | } |
| 96 | 101 | $num = $this->db->num_rows($resql); |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
| 137 | 137 | |
| 138 | 138 | // Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
| 139 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 139 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 140 | 140 | $i = 0; |
| 141 | 141 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
| 142 | 142 | foreach ($dataseries as $key => $val) { |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | if (!$error) { |
| 118 | 118 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
| 119 | - $action = ''; // To avoid to execute next actions |
|
| 119 | + $action = ''; // To avoid to execute next actions |
|
| 120 | 120 | } else { |
| 121 | 121 | setEventMessages($langs->trans("Error"), null, 'errors'); |
| 122 | - $action = ''; // To avoid to execute next actions |
|
| 122 | + $action = ''; // To avoid to execute next actions |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | if (!$error) { |
| 136 | 136 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
| 137 | - $action = ''; // To avoid to execute next actions |
|
| 137 | + $action = ''; // To avoid to execute next actions |
|
| 138 | 138 | } else { |
| 139 | 139 | setEventMessages($langs->trans("Error"), null, 'errors'); |
| 140 | - $action = ''; // To avoid to execute next actions |
|
| 140 | + $action = ''; // To avoid to execute next actions |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |