From ff25003025626eaa74514c42ff52aea9bc3d22e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 5 Jan 2021 08:59:46 +0100 Subject: [PATCH 1/3] fix unknown variable --- .../bank/class/api_bankaccounts.class.php | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php index 9ab02d8b18a..be37ec23403 100644 --- a/htdocs/compta/bank/class/api_bankaccounts.class.php +++ b/htdocs/compta/bank/class/api_bankaccounts.class.php @@ -81,10 +81,8 @@ class BankAccounts extends DolibarrApi $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid "; } // Add sql filters - if ($sqlfilters) - { - if (!DolibarrApi::_checkFilters($sqlfilters)) - { + if ($sqlfilters) { + if (!DolibarrApi::_checkFilters($sqlfilters)) { throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); } $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; @@ -93,8 +91,7 @@ class BankAccounts extends DolibarrApi $sql .= $this->db->order($sortfield, $sortorder); if ($limit) { - if ($page < 0) - { + if ($page < 0) { $page = 0; } $offset = $limit * $page; @@ -222,12 +219,10 @@ class BankAccounts extends DolibarrApi throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.'); } - if ($accountto->currency_code == $accountfrom->currency_code) - { + if ($accountto->currency_code == $accountfrom->currency_code) { $amount_to = $amount; } else { - if (!$amount_to || empty($amount_to)) - { + if (!$amount_to || empty($amount_to)) { throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.'); } } @@ -244,8 +239,7 @@ class BankAccounts extends DolibarrApi $typefrom = 'PRE'; $typeto = 'VIR'; - if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH) - { + if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH) { // This is transfer of change $typefrom = 'LIQ'; $typeto = 'LIQ'; @@ -291,8 +285,7 @@ class BankAccounts extends DolibarrApi $error++; } - if (!$error) - { + if (!$error) { $this->db->commit(); return array( @@ -327,12 +320,13 @@ class BankAccounts extends DolibarrApi } foreach ($request_data as $field => $value) { - if ($field == 'id') continue; + if ($field == 'id') { + continue; + } $account->$field = $value; } - if ($account->update(DolibarrApiAccess::$user) > 0) - { + if ($account->update(DolibarrApiAccess::$user) > 0) { return $this->get($id); } else { throw new RestException(500, $account->error); @@ -380,8 +374,9 @@ class BankAccounts extends DolibarrApi { $account = array(); foreach (BankAccounts::$FIELDS as $field) { - if (!isset($data[$field])) + if (!isset($data[$field])) { throw new RestException(400, "$field field missing"); + } $account[$field] = $data[$field]; } return $account; @@ -433,10 +428,8 @@ class BankAccounts extends DolibarrApi $sql .= " WHERE fk_account = ".$id; // Add sql filters - if ($sqlfilters) - { - if (!DolibarrApi::_checkFilters($sqlfilters)) - { + if ($sqlfilters) { + if (!DolibarrApi::_checkFilters($sqlfilters)) { throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); } $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; @@ -457,7 +450,7 @@ class BankAccounts extends DolibarrApi } } } else { - throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error); + throw new RestException(503, 'Error when retrieving list of account lines: '.$this->db->lasterror()); } return $list; @@ -476,8 +469,8 @@ class BankAccounts extends DolibarrApi * @param string $cheque_writer Name of cheque writer {@from body} * @param string $cheque_bank Bank of cheque writer {@from body} * @param string $accountancycode Accountancy code {@from body} - * @param int $datev Payment date value (timestamp) {@from body} {@type timestamp} - * @param string $num_releve Bank statement numero {@from body} + * @param int $datev Payment date value (timestamp) {@from body} {@type timestamp} + * @param string $num_releve Bank statement numero {@from body} * @return int ID of line * * @url POST {id}/lines @@ -502,8 +495,11 @@ class BankAccounts extends DolibarrApi $cheque_number, $category, DolibarrApiAccess::$user, - $cheque_writer, $cheque_bank, $accountancycode, - $datev, $num_releve + $cheque_writer, + $cheque_bank, + $accountancycode, + $datev, + $num_releve ); if ($result < 0) { throw new RestException(503, 'Error when adding line to account: '.$account->error); From 27b462782516fa65d5d89f093845f92ac5edc278 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 5 Jan 2021 17:41:24 +0100 Subject: [PATCH 2/3] Update ChangeLog some minor changings add info #15180 sorting add info #14725 --- ChangeLog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecf20be261f..8b9edc38f2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,7 @@ NEW: Accountancy - add options to disable binding on sales, purchases & expense NEW: Accountancy balance - add a menu entry to show subtotal by group NEW: Accountancy - change menu disposition NEW: Accountancy - on transfers, select the periodicity by default -NEW: Accountancy - Add export for Gestinum (v3 & v5) +NEW: Accountancy - Add export for Gestinum (v3 & v5) #15180 NEW: new currency rate editor NEW: Solve blocking feature. Can increase stock of a Kit without changing subproduct stock. NEW: add a widget to show the customers with outstanding limits reached @@ -162,7 +162,7 @@ NEW: Support for Samba4 AD NEW: TakePOS connector compatibility with RECEIPT PRINTERS module NEW: TakePOS Gift Receipt NEW: TakePOS Multicurrency compatibility -NEW: the global header of a website can also have dynamic content +NEW: TakePOS Weighing Scale compatibility with TakePOS connector #14725 NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late NEW: ticket classification on create from email collector @@ -172,11 +172,11 @@ NEW: VAT rate for Angola #15606 NEW: VAT and juridical status for Algeria NEW: VAT report - Invert constant to show by default zero VAT in reports NEW: website page fields selection -NEW: Weighing Scale compatibility with TakePOS connector +NEW: website - global header of a website can also have dynamic content NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user -NEW: add clone button on miscellaneous payment -NEW: #15065 Add option to put the product label in bold in the PDF templates if configured -NEW: Add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF." +NEW: add clone button on miscellaneous payment +NEW: add option to put the product label in bold in the PDF templates if configured #15065 +NEW: add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF." For developers: From 19b8123ddfdffd28eaa1abf28563f3cba18f2785 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:09:59 +0100 Subject: [PATCH 3/3] Update check.php $arrayphpminversionwarning = array(5, 6, 0); --- htdocs/install/check.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index eacc58e6620..daab7a7296a 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -77,7 +77,7 @@ if (!empty($useragent)) // Check PHP version $arrayphpminversionerror = array(5, 5, 0); -$arrayphpminversionwarning = array(5, 5, 0); +$arrayphpminversionwarning = array(5, 6, 0); if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) // Minimum to use (error if lower) { print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror)); @@ -105,7 +105,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"])) // We must keep $_GE } -// Check if sessions enabled +// Check if session_id is enabled if (!function_exists("session_id")) { print 'Error '.$langs->trans("ErrorPHPDoesNotSupportSessions")."
\n"; @@ -115,7 +115,7 @@ if (!function_exists("session_id")) } -// Check if GD supported (we need GD for image conversion) +// Check if GD is supported (we need GD for image conversion) if (!function_exists("imagecreate")) { $langs->load("errors"); @@ -126,7 +126,7 @@ if (!function_exists("imagecreate")) } -// Check if Curl supported +// Check if Curl is supported if (!function_exists("curl_init")) { $langs->load("errors"); @@ -145,7 +145,7 @@ if (!function_exists("easter_date")) } -// Check if UTF8 supported +// Check if UTF8 is supported if (!function_exists("utf8_encode")) { $langs->load("errors"); @@ -201,7 +201,7 @@ if ($memmaxorig != '') } -// If config file present and filled +// If that config file is present and filled clearstatcache(); if (is_readable($conffile) && filesize($conffile) > 8) {