@@ -467,13 +467,23 @@ |
||
| 467 | 467 | if ($this->product->multiprices_base_type[$key] != $oldproduct->multiprices_base_type[$key]) { |
| 468 | 468 | $pricemodified = true; |
| 469 | 469 | } else { |
| 470 | - if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) $pricemodified = true; |
|
| 470 | + if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) { |
|
| 471 | + $pricemodified = true; |
|
| 472 | + } |
|
| 471 | 473 | if ($this->product->multiprices_base_type[$key] == 'TTC') { |
| 472 | - if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) $pricemodified = true; |
|
| 473 | - if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) $pricemodified = true; |
|
| 474 | + if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) { |
|
| 475 | + $pricemodified = true; |
|
| 476 | + } |
|
| 477 | + if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) { |
|
| 478 | + $pricemodified = true; |
|
| 479 | + } |
|
| 474 | 480 | } else { |
| 475 | - if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) $pricemodified = true; |
|
| 476 | - if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) $pricemodified = true; |
|
| 481 | + if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) { |
|
| 482 | + $pricemodified = true; |
|
| 483 | + } |
|
| 484 | + if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) { |
|
| 485 | + $pricemodified = true; |
|
| 486 | + } |
|
| 477 | 487 | } |
| 478 | 488 | } |
| 479 | 489 | if ($pricemodified && $result > 0) { |
@@ -445,7 +445,9 @@ |
||
| 445 | 445 | { |
| 446 | 446 | $paymentsalary = array(); |
| 447 | 447 | $fields = Salaries::$FIELDSPAYMENT; |
| 448 | - if (isModEnabled("bank")) array_push($fields, "accountid"); |
|
| 448 | + if (isModEnabled("bank")) { |
|
| 449 | + array_push($fields, "accountid"); |
|
| 450 | + } |
|
| 449 | 451 | foreach ($fields as $field) { |
| 450 | 452 | if (!isset($data[$field])) { |
| 451 | 453 | throw new RestException(400, "$field field missing"); |
@@ -99,8 +99,9 @@ |
||
| 99 | 99 | $main_data_dir = $argv[4]; // override when executing the script in command line |
| 100 | 100 | } |
| 101 | 101 | // In mode 3 the main_url is custom |
| 102 | - if ($force_install_noedit != 3) |
|
| 103 | - $main_url = detect_dolibarr_main_url_root(); |
|
| 102 | + if ($force_install_noedit != 3) { |
|
| 103 | + $main_url = detect_dolibarr_main_url_root(); |
|
| 104 | + } |
|
| 104 | 105 | if (!empty($argv[5])) { |
| 105 | 106 | $main_url = $argv[5]; // override when executing the script in command line |
| 106 | 107 | } |