@@ -35,7 +35,9 @@ discard block |
||
| 35 | 35 | $action = GETPOST('action', 'alpha'); |
| 36 | 36 | |
| 37 | 37 | // Security check |
| 38 | -if ($user->socid) $socid = $user->socid; |
|
| 38 | +if ($user->socid) { |
|
| 39 | + $socid = $user->socid; |
|
| 40 | +} |
|
| 39 | 41 | |
| 40 | 42 | $result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer'); |
| 41 | 43 | |
@@ -175,7 +177,9 @@ discard block |
||
| 175 | 177 | $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl')); |
| 176 | 178 | foreach ($dirtpls as $reldir) { |
| 177 | 179 | $res = @include dol_buildpath($reldir.'/contacts.tpl.php'); |
| 178 | - if ($res) break; |
|
| 180 | + if ($res) { |
|
| 181 | + break; |
|
| 182 | + } |
|
| 179 | 183 | } |
| 180 | 184 | } |
| 181 | 185 | |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
| 132 | 132 | // Thirdparty |
| 133 | 133 | if (!empty($object->thirdparty)) { |
| 134 | - $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer'); |
|
| 134 | + $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer'); |
|
| 135 | 135 | } |
| 136 | 136 | // Project |
| 137 | 137 | if (isModEnabled('project')) { |
@@ -671,11 +671,11 @@ |
||
| 671 | 671 | $rankToUse = (int) $position; |
| 672 | 672 | if ($rankToUse != $line->oldcopy->position) { // check if position have a new value |
| 673 | 673 | foreach ($this->lines as $bl) { |
| 674 | - if ($bl->position >= $rankToUse AND $bl->position < ($line->oldcopy->position + 1)) { // move rank up |
|
| 674 | + if ($bl->position >= $rankToUse and $bl->position < ($line->oldcopy->position + 1)) { // move rank up |
|
| 675 | 675 | $bl->position++; |
| 676 | 676 | $bl->update($user); |
| 677 | 677 | } |
| 678 | - if ($bl->position <= $rankToUse AND $bl->position > ($line->oldcopy->position)) { // move rank down |
|
| 678 | + if ($bl->position <= $rankToUse and $bl->position > ($line->oldcopy->position)) { // move rank down |
|
| 679 | 679 | $bl->position--; |
| 680 | 680 | $bl->update($user); |
| 681 | 681 | } |
@@ -405,7 +405,6 @@ |
||
| 405 | 405 | * Load object lines in memory from the database by type of product |
| 406 | 406 | * |
| 407 | 407 | * @param int $typeproduct 0 type product, 1 type service |
| 408 | - |
|
| 409 | 408 | * @return int <0 if KO, 0 if not found, >0 if OK |
| 410 | 409 | */ |
| 411 | 410 | public function fetchLinesbytypeproduct($typeproduct = 0) |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | $sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l"; |
| 456 | 456 | $sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product"; |
| 457 | 457 | $sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id); |
| 458 | - $sql .= " AND p.fk_product_type = ". ((int) $typeproduct); |
|
| 458 | + $sql .= " AND p.fk_product_type = ".((int) $typeproduct); |
|
| 459 | 459 | if (isset($objectline->fields['position'])) { |
| 460 | 460 | $sql .= $this->db->order('position', 'ASC'); |
| 461 | 461 | } |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | if (!empty($conf->global->BOM_ADDON)) { |
| 876 | 876 | $mybool = false; |
| 877 | 877 | |
| 878 | - $file = getDolGlobalString('BOM_ADDON') . ".php"; |
|
| 878 | + $file = getDolGlobalString('BOM_ADDON').".php"; |
|
| 879 | 879 | $classname = $conf->global->BOM_ADDON; |
| 880 | 880 | |
| 881 | 881 | // Include file with class |
@@ -1190,7 +1190,7 @@ discard block |
||
| 1190 | 1190 | $label = $langs->trans("ShowBillOfMaterials"); |
| 1191 | 1191 | $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; |
| 1192 | 1192 | } |
| 1193 | - $linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
| 1193 | + $linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"'); |
|
| 1194 | 1194 | $linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"'; |
| 1195 | 1195 | } else { |
| 1196 | 1196 | $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); |
@@ -1409,7 +1409,7 @@ discard block |
||
| 1409 | 1409 | $this->unit_cost = 0; |
| 1410 | 1410 | $this->total_cost = 0; |
| 1411 | 1411 | |
| 1412 | - $parameters=array(); |
|
| 1412 | + $parameters = array(); |
|
| 1413 | 1413 | $reshook = $hookmanager->executeHooks('calculateCostsBom', $parameters, $this); // Note that $action and $object may have been modified by hook |
| 1414 | 1414 | |
| 1415 | 1415 | if ($reshook > 0) { |
@@ -1424,7 +1424,7 @@ discard block |
||
| 1424 | 1424 | foreach ($this->lines as &$line) { |
| 1425 | 1425 | $tmpproduct->cost_price = 0; |
| 1426 | 1426 | $tmpproduct->pmp = 0; |
| 1427 | - $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
| 1427 | + $result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading |
|
| 1428 | 1428 | |
| 1429 | 1429 | if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) { |
| 1430 | 1430 | if (empty($line->fk_bom_child)) { |
@@ -1533,12 +1533,12 @@ discard block |
||
| 1533 | 1533 | if (!empty($this->lines)) { |
| 1534 | 1534 | foreach ($this->lines as $line) { |
| 1535 | 1535 | if (!empty($line->childBom)) { |
| 1536 | - foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty); |
|
| 1536 | + foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty * $qty); |
|
| 1537 | 1537 | } else { |
| 1538 | 1538 | if (empty($TNetNeeds[$line->fk_product])) { |
| 1539 | 1539 | $TNetNeeds[$line->fk_product] = 0; |
| 1540 | 1540 | } |
| 1541 | - $TNetNeeds[$line->fk_product] += $line->qty*$qty; |
|
| 1541 | + $TNetNeeds[$line->fk_product] += $line->qty * $qty; |
|
| 1542 | 1542 | } |
| 1543 | 1543 | } |
| 1544 | 1544 | } |
@@ -1560,9 +1560,9 @@ discard block |
||
| 1560 | 1560 | foreach ($line->childBom as $childBom) { |
| 1561 | 1561 | $TNetNeeds[$childBom->id]['bom'] = $childBom; |
| 1562 | 1562 | $TNetNeeds[$childBom->id]['parentid'] = $this->id; |
| 1563 | - $TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty; |
|
| 1563 | + $TNetNeeds[$childBom->id]['qty'] = $line->qty * $qty; |
|
| 1564 | 1564 | $TNetNeeds[$childBom->id]['level'] = $level; |
| 1565 | - $childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1); |
|
| 1565 | + $childBom->getNetNeedsTree($TNetNeeds, $line->qty * $qty, $level + 1); |
|
| 1566 | 1566 | } |
| 1567 | 1567 | } else { |
| 1568 | 1568 | $TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty; |
@@ -1588,7 +1588,7 @@ discard block |
||
| 1588 | 1588 | return; |
| 1589 | 1589 | } |
| 1590 | 1590 | |
| 1591 | - if (empty($bom_id)) $bom_id=$this->id; |
|
| 1591 | + if (empty($bom_id)) $bom_id = $this->id; |
|
| 1592 | 1592 | |
| 1593 | 1593 | $sql = 'SELECT l.fk_bom, b.label |
| 1594 | 1594 | FROM '.MAIN_DB_PREFIX.'bom_bomline l |
@@ -1599,7 +1599,7 @@ discard block |
||
| 1599 | 1599 | if (!empty($resql)) { |
| 1600 | 1600 | while ($res = $this->db->fetch_object($resql)) { |
| 1601 | 1601 | $TParentBom[$res->fk_bom] = $res->fk_bom; |
| 1602 | - $this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level+1); |
|
| 1602 | + $this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level + 1); |
|
| 1603 | 1603 | } |
| 1604 | 1604 | } |
| 1605 | 1605 | } |
@@ -1613,7 +1613,7 @@ discard block |
||
| 1613 | 1613 | */ |
| 1614 | 1614 | public function getKanbanView($option = '', $arraydata = null) |
| 1615 | 1615 | { |
| 1616 | - global $db,$langs; |
|
| 1616 | + global $db, $langs; |
|
| 1617 | 1617 | |
| 1618 | 1618 | $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); |
| 1619 | 1619 | |
@@ -781,7 +781,9 @@ discard block |
||
| 781 | 781 | $line->import_key = $import_key; |
| 782 | 782 | $line->position = $rankToUse; |
| 783 | 783 | |
| 784 | - if (!empty($fk_unit)) $line->fk_unit = $fk_unit; |
|
| 784 | + if (!empty($fk_unit)) { |
|
| 785 | + $line->fk_unit = $fk_unit; |
|
| 786 | + } |
|
| 785 | 787 | |
| 786 | 788 | |
| 787 | 789 | if (is_array($array_options) && count($array_options) > 0) { |
@@ -1475,8 +1477,9 @@ discard block |
||
| 1475 | 1477 | $workstation = new Workstation($this->db); |
| 1476 | 1478 | $res = $workstation->fetch($tmpproduct->fk_default_workstation); |
| 1477 | 1479 | |
| 1478 | - if ($res > 0) $line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT'); |
|
| 1479 | - else { |
|
| 1480 | + if ($res > 0) { |
|
| 1481 | + $line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT'); |
|
| 1482 | + } else { |
|
| 1480 | 1483 | $this->error = $workstation->error; |
| 1481 | 1484 | return -3; |
| 1482 | 1485 | } |
@@ -1540,7 +1543,9 @@ discard block |
||
| 1540 | 1543 | if (!empty($this->lines)) { |
| 1541 | 1544 | foreach ($this->lines as $line) { |
| 1542 | 1545 | if (!empty($line->childBom)) { |
| 1543 | - foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty); |
|
| 1546 | + foreach ($line->childBom as $childBom) { |
|
| 1547 | + $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty); |
|
| 1548 | + } |
|
| 1544 | 1549 | } else { |
| 1545 | 1550 | if (empty($TNetNeeds[$line->fk_product])) { |
| 1546 | 1551 | $TNetNeeds[$line->fk_product] = 0; |
@@ -1595,7 +1600,9 @@ discard block |
||
| 1595 | 1600 | return; |
| 1596 | 1601 | } |
| 1597 | 1602 | |
| 1598 | - if (empty($bom_id)) $bom_id=$this->id; |
|
| 1603 | + if (empty($bom_id)) { |
|
| 1604 | + $bom_id=$this->id; |
|
| 1605 | + } |
|
| 1599 | 1606 | |
| 1600 | 1607 | $sql = 'SELECT l.fk_bom, b.label |
| 1601 | 1608 | FROM '.MAIN_DB_PREFIX.'bom_bomline l |
@@ -550,7 +550,7 @@ |
||
| 550 | 550 | $langs->load($reg[1]); |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | - $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 553 | + $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
| 554 | 554 | |
| 555 | 555 | $morehtmlref = '<div class="refidno">'; |
| 556 | 556 | $morehtmlref .= $langs->trans($labeltoshow); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | print '<tr class="oddeven value">'; |
| 279 | 279 | // Param |
| 280 | 280 | print '<td>'; |
| 281 | -print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
| 281 | +print img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
| 282 | 282 | print '</td>'; |
| 283 | 283 | // Value |
| 284 | 284 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -288,13 +288,13 @@ discard block |
||
| 288 | 288 | |
| 289 | 289 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') { |
| 290 | 290 | print '<tr class="oddeven">'; |
| 291 | - print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>'; |
|
| 291 | + print '<td>'.img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnCustomerDeposit").'</td>'; |
|
| 292 | 292 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) { |
| 293 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 293 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 294 | 294 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
| 295 | 295 | print '</a></td>'; |
| 296 | 296 | } else { |
| 297 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 297 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 298 | 298 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
| 299 | 299 | print '</a></td>'; |
| 300 | 300 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | print '<tr class="oddeven value">'; |
| 306 | 306 | // Param |
| 307 | 307 | print '<td>'; |
| 308 | -print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
| 308 | +print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
| 309 | 309 | print '</td>'; |
| 310 | 310 | // Value |
| 311 | 311 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -315,13 +315,13 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') { |
| 317 | 317 | print '<tr class="oddeven">'; |
| 318 | - print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>'; |
|
| 318 | + print '<td>'.img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnSupplierDeposit").'</td>'; |
|
| 319 | 319 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) { |
| 320 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 320 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
| 321 | 321 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
| 322 | 322 | print '</a></td>'; |
| 323 | 323 | } else { |
| 324 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 324 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
| 325 | 325 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
| 326 | 326 | print '</a></td>'; |
| 327 | 327 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $disablejs = 0; |
| 70 | 70 | $disablehead = 0; |
| 71 | 71 | |
| 72 | -$head='<link rel="stylesheet" href="css/pos.css.php">'; |
|
| 72 | +$head = '<link rel="stylesheet" href="css/pos.css.php">'; |
|
| 73 | 73 | if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) { |
| 74 | 74 | $head .= '<link rel="stylesheet" href="css/colorful.css">'; |
| 75 | 75 | } |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | |
| 678 | 678 | <?php |
| 679 | 679 | // Add code from hooks |
| 680 | -$parameters=array(); |
|
| 680 | +$parameters = array(); |
|
| 681 | 681 | $hookmanager->executeHooks('completePayment', $parameters, $invoice); |
| 682 | 682 | print $hookmanager->resPrint; |
| 683 | 683 | ?> |
@@ -231,7 +231,9 @@ discard block |
||
| 231 | 231 | $arrayOfValidPaymentModes[] = $obj; |
| 232 | 232 | } |
| 233 | 233 | if (!isModEnabled('banque')) { |
| 234 | - if ($paycode == 'CASH' || $paycode == 'CB') $arrayOfValidPaymentModes[] = $obj; |
|
| 234 | + if ($paycode == 'CASH' || $paycode == 'CB') { |
|
| 235 | + $arrayOfValidPaymentModes[] = $obj; |
|
| 236 | + } |
|
| 235 | 237 | } |
| 236 | 238 | } |
| 237 | 239 | } |
@@ -338,7 +340,9 @@ discard block |
||
| 338 | 340 | const bodyContent = JSON.stringify({ amount : amount, invoiceid : invoiceid }); |
| 339 | 341 | <?php |
| 340 | 342 | $urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=createPaymentIntent&token='.newToken().'&servicestatus='.$servicestatus; |
| 341 | - if (!empty($stripeacc)) $urlpaymentintent .= '&stripeacc='.$stripeacc; |
|
| 343 | + if (!empty($stripeacc)) { |
|
| 344 | + $urlpaymentintent .= '&stripeacc='.$stripeacc; |
|
| 345 | + } |
|
| 342 | 346 | ?> |
| 343 | 347 | return fetch('<?php echo $urlpaymentintent; ?>', { |
| 344 | 348 | method: "POST", |
@@ -668,7 +672,9 @@ discard block |
||
| 668 | 672 | |
| 669 | 673 | $parameters = array(); |
| 670 | 674 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $invoice, $action); // Note that $action and $object may have been modified by hook |
| 671 | -if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 675 | +if ($reshook < 0) { |
|
| 676 | + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 677 | +} |
|
| 672 | 678 | |
| 673 | 679 | $class = ($i == 3) ? "calcbutton3" : "calcbutton2"; |
| 674 | 680 | foreach ($action_buttons as $button) { |
@@ -161,21 +161,21 @@ |
||
| 161 | 161 | if (isModEnabled('societe')) { |
| 162 | 162 | print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>'; |
| 163 | 163 | print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_CONTACT_ACTIVE'), 'activecontact', array(Ldap::SYNCHRO_LDAP_TO_DOLIBARR)); |
| 164 | - print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnContactActiveExample") . '</span></td></tr>'; |
|
| 164 | + print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnContactActiveExample").'</span></td></tr>'; |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | // Synchro member active |
| 168 | 168 | if (isModEnabled('adherent')) { |
| 169 | - print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberActive") . '</td><td>'; |
|
| 169 | + print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>'; |
|
| 170 | 170 | print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_ACTIVE'), 'activemembers', array(), 2); |
| 171 | - print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberActiveExample") . '</span></td></tr>'; |
|
| 171 | + print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberActiveExample").'</span></td></tr>'; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // Synchro member type active |
| 175 | 175 | if (isModEnabled('adherent')) { |
| 176 | - print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberTypeActive") . '</td><td>'; |
|
| 176 | + print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberTypeActive").'</td><td>'; |
|
| 177 | 177 | print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE'), 'activememberstypes', array(), 2); |
| 178 | - print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberTypeActiveExample") . '</span></td></tr>'; |
|
| 178 | + print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberTypeActiveExample").'</span></td></tr>'; |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | // Fields from hook |
@@ -100,14 +100,14 @@ |
||
| 100 | 100 | |
| 101 | 101 | // Param |
| 102 | 102 | $label = $langs->trans($key); |
| 103 | - print '<td><label for="' . $key . '">' . $label . '</label></td>'; |
|
| 103 | + print '<td><label for="'.$key.'">'.$label.'</label></td>'; |
|
| 104 | 104 | |
| 105 | 105 | // Value |
| 106 | 106 | print '<td>'; |
| 107 | 107 | if (isModEnabled('accounting')) { |
| 108 | 108 | print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1); |
| 109 | 109 | } else { |
| 110 | - print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . getDolGlobalString($key) . '">'; |
|
| 110 | + print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">'; |
|
| 111 | 111 | } |
| 112 | 112 | print '</td></tr>'; |
| 113 | 113 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | accessforbidden(); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | -$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0); |
|
| 76 | +$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
|
| 77 | 77 | $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft); |
| 78 | 78 | |
| 79 | 79 | $permissiontoread = $user->rights->eventorganization->read; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | if ($user->socid > 0) { |
| 88 | 88 | accessforbidden(); |
| 89 | 89 | } |
| 90 | -$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0); |
|
| 90 | +$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
|
| 91 | 91 | $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft); |
| 92 | 92 | |
| 93 | 93 | if (!$permissiontoread) { |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); |
| 112 | 112 | |
| 113 | 113 | if ($result >= 0) { |
| 114 | - header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':'')); |
|
| 114 | + header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : '')); |
|
| 115 | 115 | exit; |
| 116 | 116 | } else { |
| 117 | 117 | if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $result = $object->delete_contact($lineid); |
| 130 | 130 | |
| 131 | 131 | if ($result >= 0) { |
| 132 | - header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':'')); |
|
| 132 | + header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : '')); |
|
| 133 | 133 | exit; |
| 134 | 134 | } else { |
| 135 | 135 | dol_print_error($db); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | if (!empty($projectstatic->socid)) { |
| 166 | 166 | $projectstatic->fetch_thirdparty(); |
| 167 | 167 | } |
| 168 | -$withProjectUrl=''; |
|
| 168 | +$withProjectUrl = ''; |
|
| 169 | 169 | $object->project = clone $projectstatic; |
| 170 | 170 | |
| 171 | 171 | if (!empty($withproject)) { |
@@ -53,11 +53,17 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // Security check (enable the most restrictive one) |
| 56 | -if ($user->socid > 0) accessforbidden(); |
|
| 56 | +if ($user->socid > 0) { |
|
| 57 | + accessforbidden(); |
|
| 58 | +} |
|
| 57 | 59 | $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 58 | 60 | restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 59 | -if (!isModEnabled('asset')) accessforbidden(); |
|
| 60 | -if (!empty($object->not_depreciated)) accessforbidden(); |
|
| 61 | +if (!isModEnabled('asset')) { |
|
| 62 | + accessforbidden(); |
|
| 63 | +} |
|
| 64 | +if (!empty($object->not_depreciated)) { |
|
| 65 | + accessforbidden(); |
|
| 66 | +} |
|
| 61 | 67 | |
| 62 | 68 | $object->asset_depreciation_options = &$assetdepreciationoptions; |
| 63 | 69 | $result = $assetdepreciationoptions->fetchDeprecationOptions($object->id); |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // Load Dolibarr environment |
| 26 | 26 | require '../main.inc.php'; |
| 27 | -require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php'; |
|
| 28 | -require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php'; |
|
| 29 | -require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php'; |
|
| 27 | +require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; |
|
| 28 | +require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php'; |
|
| 29 | +require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php'; |
|
| 30 | 30 | |
| 31 | 31 | // Load translation files required by the page |
| 32 | 32 | $langs->loadLangs(array("assets", "companies")); |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | $extrafields->fetch_name_optionals_label($object->table_element); |
| 49 | 49 | |
| 50 | 50 | // Load object |
| 51 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 51 | +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
| 52 | 52 | if ($id > 0 || !empty($ref)) { |
| 53 | - $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id; |
|
| 53 | + $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id; |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Security check (enable the most restrictive one) |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | // Object card |
| 100 | 100 | // ------------------------------------------------------------ |
| 101 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 101 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 102 | 102 | |
| 103 | 103 | $morehtmlref = '<div class="refidno">'; |
| 104 | 104 | $morehtmlref .= '</div>'; |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | print '<div class="fichecenter">'; |
| 135 | 135 | print '<div class="fichehalfleft">'; |
| 136 | 136 | print '<div class="underbanner clearboth"></div>'; |
| 137 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 138 | - print '<tr><td class="titlefield">' . $langs->trans('AssetBaseDepreciationHT') . '</td><td>' . price($depreciation_info['base_depreciation_ht']) . '</td></tr>'; |
|
| 139 | - print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationBeginDate') . '</td><td>' . dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day') . '</td></tr>'; |
|
| 137 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 138 | + print '<tr><td class="titlefield">'.$langs->trans('AssetBaseDepreciationHT').'</td><td>'.price($depreciation_info['base_depreciation_ht']).'</td></tr>'; |
|
| 139 | + print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationBeginDate').'</td><td>'.dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day').'</td></tr>'; |
|
| 140 | 140 | print '</table>'; |
| 141 | 141 | |
| 142 | 142 | // We close div and reopen for second column |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | print '<div class="underbanner clearboth"></div>'; |
| 147 | 147 | print '<table class="border centpercent tableforfield">'; |
| 148 | - print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationDuration') . '</td><td>' . $depreciation_info['duration'] . ' ( ' . $depreciation_info['duration_type'] . ' )</td></tr>'; |
|
| 149 | - print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationRate') . '</td><td>' . $depreciation_info['rate'] . '</td></tr>'; |
|
| 148 | + print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationDuration').'</td><td>'.$depreciation_info['duration'].' ( '.$depreciation_info['duration_type'].' )</td></tr>'; |
|
| 149 | + print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationRate').'</td><td>'.$depreciation_info['rate'].'</td></tr>'; |
|
| 150 | 150 | print '</table>'; |
| 151 | 151 | print '</div>'; |
| 152 | 152 | print '</div>'; |
@@ -160,21 +160,21 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | print '<tr class="liste_titre">'; |
| 162 | 162 | print '<td class="width20"></td>'; |
| 163 | - print '<td>' . $langs->trans("Ref") . '</td>'; |
|
| 164 | - print '<td class="center">' . $langs->trans("AssetDepreciationDate") . '</td>'; |
|
| 165 | - print '<td class="right">' . $langs->trans("AssetDepreciationHT") . '</td>'; |
|
| 166 | - print '<td class="right">' . $langs->trans("AssetCumulativeDepreciationHT") . '</td>'; |
|
| 167 | - print '<td class="right">' . $langs->trans("AssetResidualHT") . '</td>'; |
|
| 163 | + print '<td>'.$langs->trans("Ref").'</td>'; |
|
| 164 | + print '<td class="center">'.$langs->trans("AssetDepreciationDate").'</td>'; |
|
| 165 | + print '<td class="right">'.$langs->trans("AssetDepreciationHT").'</td>'; |
|
| 166 | + print '<td class="right">'.$langs->trans("AssetCumulativeDepreciationHT").'</td>'; |
|
| 167 | + print '<td class="right">'.$langs->trans("AssetResidualHT").'</td>'; |
|
| 168 | 168 | print '</tr>'; |
| 169 | 169 | |
| 170 | 170 | if (empty($lines)) { |
| 171 | - print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>'; |
|
| 171 | + print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>'; |
|
| 172 | 172 | } else { |
| 173 | 173 | foreach ($lines as $line) { |
| 174 | 174 | print '<tr class="oddeven">'; |
| 175 | - print '<td>' . ($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')) . '</td>'; |
|
| 176 | - print '<td >' . (empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']) . '</td>'; |
|
| 177 | - print '<td class="center">' . dol_print_date($line['depreciation_date'], 'day') . '</td>'; |
|
| 175 | + print '<td>'.($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')).'</td>'; |
|
| 176 | + print '<td >'.(empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']).'</td>'; |
|
| 177 | + print '<td class="center">'.dol_print_date($line['depreciation_date'], 'day').'</td>'; |
|
| 178 | 178 | print '<td class="right">'; |
| 179 | 179 | print price($line['depreciation_ht']); |
| 180 | 180 | print '</td>'; |