@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 298 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 299 | 299 | /** |
| 300 | 300 | * Clean sensible object datas |
| 301 | 301 | * |
@@ -304,30 +304,30 @@ discard block |
||
| 304 | 304 | */ |
| 305 | 305 | public function _cleanObjectDatas($object) |
| 306 | 306 | { |
| 307 | - // phpcs:disable |
|
| 308 | - $object = parent::_cleanObjectDatas($object); |
|
| 309 | - |
|
| 310 | - return $object; |
|
| 311 | - } |
|
| 312 | - |
|
| 313 | - /** |
|
| 314 | - * Validate fields before create or update object |
|
| 315 | - * |
|
| 316 | - * @param array $data Array of data to validate |
|
| 317 | - * @param array $fields Array of fields needed |
|
| 318 | - * @return array |
|
| 319 | - * |
|
| 320 | - * @throws RestException |
|
| 321 | - */ |
|
| 322 | - private function validate($data, $fields) |
|
| 323 | - { |
|
| 324 | - $hook = array(); |
|
| 325 | - foreach ($fields as $field) { |
|
| 326 | - if (!isset($data[$field])) { |
|
| 327 | - throw new RestException(400, $field." field missing"); |
|
| 328 | - } |
|
| 329 | - $hook[$field] = $data[$field]; |
|
| 330 | - } |
|
| 331 | - return $hook; |
|
| 332 | - } |
|
| 307 | + // phpcs:disable |
|
| 308 | + $object = parent::_cleanObjectDatas($object); |
|
| 309 | + |
|
| 310 | + return $object; |
|
| 311 | + } |
|
| 312 | + |
|
| 313 | + /** |
|
| 314 | + * Validate fields before create or update object |
|
| 315 | + * |
|
| 316 | + * @param array $data Array of data to validate |
|
| 317 | + * @param array $fields Array of fields needed |
|
| 318 | + * @return array |
|
| 319 | + * |
|
| 320 | + * @throws RestException |
|
| 321 | + */ |
|
| 322 | + private function validate($data, $fields) |
|
| 323 | + { |
|
| 324 | + $hook = array(); |
|
| 325 | + foreach ($fields as $field) { |
|
| 326 | + if (!isset($data[$field])) { |
|
| 327 | + throw new RestException(400, $field." field missing"); |
|
| 328 | + } |
|
| 329 | + $hook[$field] = $data[$field]; |
|
| 330 | + } |
|
| 331 | + return $hook; |
|
| 332 | + } |
|
| 333 | 333 | } |
@@ -163,15 +163,15 @@ discard block |
||
| 163 | 163 | <th class="right"><?php print $langs->trans("Qty"); ?></th> |
| 164 | 164 | <th class="right"><?php if ($gift != 1) { |
| 165 | 165 | print $langs->trans("Price"); |
| 166 | - } ?></th> |
|
| 166 | + } ?></th> |
|
| 167 | 167 | <?php if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?> |
| 168 | 168 | <th class="right"><?php if ($gift != 1) { |
| 169 | 169 | print $langs->trans("TotalHT"); |
| 170 | - } ?></th> |
|
| 170 | + } ?></th> |
|
| 171 | 171 | <?php } ?> |
| 172 | 172 | <th class="right"><?php if ($gift != 1) { |
| 173 | 173 | print $langs->trans("TotalTTC"); |
| 174 | - } ?></th> |
|
| 174 | + } ?></th> |
|
| 175 | 175 | </tr> |
| 176 | 176 | </thead> |
| 177 | 177 | <tbody> |
@@ -201,17 +201,17 @@ discard block |
||
| 201 | 201 | <td class="right"><?php echo $line->qty; ?></td> |
| 202 | 202 | <td class="right"><?php if ($gift != 1) { |
| 203 | 203 | echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); |
| 204 | - } ?></td> |
|
| 204 | + } ?></td> |
|
| 205 | 205 | <?php |
| 206 | 206 | if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?> |
| 207 | 207 | <td class="right"><?php if ($gift != 1) { |
| 208 | 208 | echo price($line->total_ht, 1); |
| 209 | - } ?></td> |
|
| 209 | + } ?></td> |
|
| 210 | 210 | <?php |
| 211 | 211 | } ?> |
| 212 | 212 | <td class="right"><?php if ($gift != 1) { |
| 213 | 213 | echo price($line->total_ttc, 1); |
| 214 | - } ?></td> |
|
| 214 | + } ?></td> |
|
| 215 | 215 | </tr> |
| 216 | 216 | <?php |
| 217 | 217 | } |
@@ -224,10 +224,10 @@ discard block |
||
| 224 | 224 | <tr> |
| 225 | 225 | <th class="right"><?php if ($gift != 1) { |
| 226 | 226 | echo $langs->trans("TotalHT"); |
| 227 | - } ?></th> |
|
| 227 | + } ?></th> |
|
| 228 | 228 | <td class="right"><?php if ($gift != 1) { |
| 229 | 229 | echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 230 | - } ?></td> |
|
| 230 | + } ?></td> |
|
| 231 | 231 | </tr> |
| 232 | 232 | <?php if (getDolGlobalString('TAKEPOS_TICKET_VAT_GROUPPED')) { |
| 233 | 233 | $vat_groups = array(); |
@@ -243,10 +243,10 @@ discard block |
||
| 243 | 243 | <tr> |
| 244 | 244 | <th align="right"><?php if ($gift != 1) { |
| 245 | 245 | echo $langs->trans("VAT") . ' ' . vatrate($key, 1); |
| 246 | - } ?></th> |
|
| 246 | + } ?></th> |
|
| 247 | 247 | <td align="right"><?php if ($gift != 1) { |
| 248 | 248 | echo price($val, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 249 | - } ?></td> |
|
| 249 | + } ?></td> |
|
| 250 | 250 | </tr> |
| 251 | 251 | <?php |
| 252 | 252 | } |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | <tr> |
| 255 | 255 | <th class="right"><?php if ($gift != 1) { |
| 256 | 256 | echo $langs->trans("TotalVAT") . '</th><td class="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 257 | - } ?></td> |
|
| 257 | + } ?></td> |
|
| 258 | 258 | </tr> |
| 259 | 259 | <?php } |
| 260 | 260 | |
@@ -264,20 +264,20 @@ discard block |
||
| 264 | 264 | <tr> |
| 265 | 265 | <th class="right"><?php if ($gift != 1) { |
| 266 | 266 | echo '' . $langs->trans("TotalLT1") . '</th><td class="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 267 | - } ?></td> |
|
| 267 | + } ?></td> |
|
| 268 | 268 | </tr> |
| 269 | 269 | <?php } ?> |
| 270 | 270 | <?php if (price2num($object->total_localtax2, 'MU') || $mysoc->useLocalTax(2)) { ?> |
| 271 | 271 | <tr> |
| 272 | 272 | <th class="right"><?php if ($gift != 1) { |
| 273 | 273 | echo '' . $langs->trans("TotalLT2") . '</th><td class="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 274 | - } ?></td> |
|
| 274 | + } ?></td> |
|
| 275 | 275 | </tr> |
| 276 | 276 | <?php } ?> |
| 277 | 277 | <tr> |
| 278 | 278 | <th class="right"><?php if ($gift != 1) { |
| 279 | 279 | echo '' . $langs->trans("TotalTTC") . '</th><td class="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . "\n"; |
| 280 | - } ?></td> |
|
| 280 | + } ?></td> |
|
| 281 | 281 | </tr> |
| 282 | 282 | <?php |
| 283 | 283 | if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) { |
@@ -228,9 +228,9 @@ |
||
| 228 | 228 | $floor--; |
| 229 | 229 | echo $floor; |
| 230 | 230 | $floor++; |
| 231 | - } else { |
|
| 232 | - echo "1"; |
|
| 233 | - } ?>';"> |
|
| 231 | + } else { |
|
| 232 | + echo "1"; |
|
| 233 | + } ?>';"> |
|
| 234 | 234 | <?php } ?> |
| 235 | 235 | <span class="valignmiddle"><?php echo $langs->trans("Floor") . " " . $floor; ?></span> |
| 236 | 236 | <img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; |
@@ -1496,11 +1496,11 @@ |
||
| 1496 | 1496 | ?> |
| 1497 | 1497 | <div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) { |
| 1498 | 1498 | echo 'onclick="MoreCategories(\'less\')"'; |
| 1499 | - } elseif ($count == ($MAXCATEG - 1)) { |
|
| 1500 | - echo 'onclick="MoreCategories(\'more\')"'; |
|
| 1501 | - } else { |
|
| 1502 | - echo 'onclick="LoadProducts(' . $count . ')"'; |
|
| 1503 | - } ?> id="catdiv<?php echo $count; ?>"> |
|
| 1499 | + } elseif ($count == ($MAXCATEG - 1)) { |
|
| 1500 | + echo 'onclick="MoreCategories(\'more\')"'; |
|
| 1501 | + } else { |
|
| 1502 | + echo 'onclick="LoadProducts(' . $count . ')"'; |
|
| 1503 | + } ?> id="catdiv<?php echo $count; ?>"> |
|
| 1504 | 1504 | <?php |
| 1505 | 1505 | if ($count == ($MAXCATEG - 2)) { |
| 1506 | 1506 | //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />'; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | return $object; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 84 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 85 | 85 | /** |
| 86 | 86 | * Set content of ->tpl array, to use into template |
| 87 | 87 | * |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function assign_values(&$action, $id) |
| 93 | 93 | { |
| 94 | - // phpcs:enable |
|
| 94 | + // phpcs:enable |
|
| 95 | 95 | global $conf, $langs, $user, $canvas; |
| 96 | 96 | global $form, $formcompany, $objsoc; |
| 97 | 97 | |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 278 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 279 | 279 | /** |
| 280 | 280 | * Assign POST values into object |
| 281 | 281 | * |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | */ |
| 284 | 284 | private function assign_post() |
| 285 | 285 | { |
| 286 | - // phpcs:enable |
|
| 286 | + // phpcs:enable |
|
| 287 | 287 | global $langs, $mysoc; |
| 288 | 288 | |
| 289 | 289 | $this->object->socid = GETPOSTINT("socid"); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | return $out; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 77 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 78 | 78 | /** |
| 79 | 79 | * Assign custom values for canvas |
| 80 | 80 | * |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function assign_values(&$action, $id) |
| 86 | 86 | { |
| 87 | - // phpcs:enable |
|
| 87 | + // phpcs:enable |
|
| 88 | 88 | global $conf, $db, $langs, $user; |
| 89 | 89 | global $form; |
| 90 | 90 | |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | |
| 691 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 691 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 692 | 692 | /** |
| 693 | 693 | * Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee |
| 694 | 694 | * |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | */ |
| 698 | 698 | public function update_fk_bank($id_bank) |
| 699 | 699 | { |
| 700 | - // phpcs:enable |
|
| 700 | + // phpcs:enable |
|
| 701 | 701 | $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_salary SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id); |
| 702 | 702 | |
| 703 | 703 | dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG); |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | return $this->LibStatut($this->statut, $mode); |
| 777 | 777 | } |
| 778 | 778 | |
| 779 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 779 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 780 | 780 | /** |
| 781 | 781 | * Return the status |
| 782 | 782 | * |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | */ |
| 787 | 787 | public function LibStatut($status, $mode = 0) |
| 788 | 788 | { |
| 789 | - // phpcs:enable |
|
| 789 | + // phpcs:enable |
|
| 790 | 790 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
| 791 | 791 | |
| 792 | 792 | $langs->load('compta'); |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | return $paymentsalary; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 458 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
| 459 | 459 | /** |
| 460 | 460 | * Clean sensible object datas |
| 461 | 461 | * |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | */ |
| 465 | 465 | protected function _cleanObjectDatas($object) |
| 466 | 466 | { |
| 467 | - // phpcs:enable |
|
| 467 | + // phpcs:enable |
|
| 468 | 468 | $object = parent::_cleanObjectDatas($object); |
| 469 | 469 | |
| 470 | 470 | unset($object->rowid); |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 451 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 452 | 452 | /** |
| 453 | 453 | * Update link between payment salary and line generate into llx_bank |
| 454 | 454 | * |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | */ |
| 458 | 458 | public function update_fk_bank($id_bank) |
| 459 | 459 | { |
| 460 | - // phpcs:enable |
|
| 460 | + // phpcs:enable |
|
| 461 | 461 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'salary SET fk_bank = ' . ((int) $id_bank); |
| 462 | 462 | $sql .= " WHERE rowid = " . ((int) $this->id); |
| 463 | 463 | $result = $this->db->query($sql); |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | } |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 668 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 669 | 669 | /** |
| 670 | 670 | * Tag social contribution as paid completely |
| 671 | 671 | * |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | */ |
| 677 | 677 | public function set_paid($user) |
| 678 | 678 | { |
| 679 | - // phpcs:enable |
|
| 679 | + // phpcs:enable |
|
| 680 | 680 | dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE); |
| 681 | 681 | return $this->setPaid($user); |
| 682 | 682 | } |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | } |
| 704 | 704 | } |
| 705 | 705 | |
| 706 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 706 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 707 | 707 | /** |
| 708 | 708 | * Remove tag paid on social contribution |
| 709 | 709 | * |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | */ |
| 713 | 713 | public function set_unpaid($user) |
| 714 | 714 | { |
| 715 | - // phpcs:enable |
|
| 715 | + // phpcs:enable |
|
| 716 | 716 | $sql = "UPDATE " . MAIN_DB_PREFIX . "salary SET"; |
| 717 | 717 | $sql .= " paye = 0"; |
| 718 | 718 | $sql .= " WHERE rowid = " . ((int) $this->id); |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
| 741 | 741 | } |
| 742 | 742 | |
| 743 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 743 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 744 | 744 | /** |
| 745 | 745 | * Return label of a given status |
| 746 | 746 | * |
@@ -751,7 +751,7 @@ discard block |
||
| 751 | 751 | */ |
| 752 | 752 | public function LibStatut($status, $mode = 0, $alreadypaid = -1) |
| 753 | 753 | { |
| 754 | - // phpcs:enable |
|
| 754 | + // phpcs:enable |
|
| 755 | 755 | global $langs; |
| 756 | 756 | |
| 757 | 757 | // Load translation files required by the page |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | return $return; |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 837 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 838 | 838 | /** |
| 839 | 839 | * Create a withdrawal request for a direct debit order or a credit transfer order. |
| 840 | 840 | * Use the remain to pay excluding all existing open direct debit requests. |
@@ -848,7 +848,7 @@ discard block |
||
| 848 | 848 | */ |
| 849 | 849 | public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'salaire', $checkduplicateamongall = 0) |
| 850 | 850 | { |
| 851 | - // phpcs:enable |
|
| 851 | + // phpcs:enable |
|
| 852 | 852 | global $conf, $mysoc; |
| 853 | 853 | |
| 854 | 854 | $error = 0; |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | } |
| 957 | 957 | } |
| 958 | 958 | |
| 959 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 959 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 960 | 960 | /** |
| 961 | 961 | * Remove a direct debit request or a credit transfer request |
| 962 | 962 | * |
@@ -966,7 +966,7 @@ discard block |
||
| 966 | 966 | */ |
| 967 | 967 | public function demande_prelevement_delete($fuser, $did) |
| 968 | 968 | { |
| 969 | - // phpcs:enable |
|
| 969 | + // phpcs:enable |
|
| 970 | 970 | $sql = 'DELETE FROM ' . $this->db->prefix() . 'prelevement_demande'; |
| 971 | 971 | $sql .= ' WHERE rowid = ' . ((int) $did); |
| 972 | 972 | $sql .= ' AND traite = 0'; |