From a17ac09fd05620fda3258c1211949f632fa1bb3d Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 14 Feb 2022 11:03:44 +0100 Subject: [PATCH] Resolve stickler-ci --- htdocs/accountancy/class/accountingjournal.class.php | 2 +- htdocs/accountancy/journal/variousjournal.php | 6 ++---- htdocs/asset/card.php | 5 ++--- htdocs/asset/class/assetaccountancycodes.class.php | 4 +++- htdocs/asset/model/card.php | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index 5ccaa971e5c..16fb2a2bbff 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -1002,7 +1002,7 @@ class AccountingJournal extends CommonObject * @param string $account Accounting account number * @return array Accounting account infos */ - function getAccountingAccountInfos($account) + public function getAccountingAccountInfos($account) { if (!isset(self::$accounting_account_cached[$account])) { require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php index 378c0dbb915..b8e2092bdb8 100644 --- a/htdocs/accountancy/journal/variousjournal.php +++ b/htdocs/accountancy/journal/variousjournal.php @@ -121,10 +121,8 @@ if ($action == 'writebookkeeping') { } $reload = true; -} - -// Export -elseif ($action == 'exportcsv') { +} elseif ($action == 'exportcsv') { + // Export CSV $result = $object->exportCsv($journal_data, $date_end); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 6b2e88ac630..25baca3243f 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -253,9 +253,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Confirmation to delete if ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAsset'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); - } - // Disposal - elseif ($action == 'disposal') { + } elseif ($action == 'disposal') { + // Disposal $langs->load('bills'); $disposal_date = dol_mktime(12, 0, 0, GETPOST('disposal_datemonth', 'int'), GETPOST('disposal_dateday', 'int'), GETPOST('disposal_dateyear', 'int')); // for date without hour, we use gmt diff --git a/htdocs/asset/class/assetaccountancycodes.class.php b/htdocs/asset/class/assetaccountancycodes.class.php index 112aa1e3f35..1107c334c6f 100644 --- a/htdocs/asset/class/assetaccountancycodes.class.php +++ b/htdocs/asset/class/assetaccountancycodes.class.php @@ -80,6 +80,8 @@ class AssetAccountancyCodes extends CommonObject /** * Fill accountancy_codes property of object (using for data sent by forms) + * + * @return array Array of values */ public function setAccountancyCodesFromPost() { @@ -104,7 +106,7 @@ class AssetAccountancyCodes extends CommonObject public function fetchAccountancyCodes($asset_id = 0, $asset_model_id = 0) { global $langs, $hookmanager; - dol_syslog(__METHOD__ . " sset_id=$asset_id, asset_model_id=$asset_model_id"); + dol_syslog(__METHOD__ . " asset_id=$asset_id, asset_model_id=$asset_model_id"); $error = 0; $this->errors = array(); diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php index 15b90e6dee3..3e0858da55e 100644 --- a/htdocs/asset/model/card.php +++ b/htdocs/asset/model/card.php @@ -221,8 +221,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Confirmation to delete if ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteAssetModel'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); - } // Clone confirmation - elseif ($action == 'clone') { + } elseif ($action == 'clone') { + // Clone confirmation // Create an array for form $formquestion = array(); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);