lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve stickler-ci

Browse Source
This commit is contained in:
Alexandre SPANGARO 2022-02-14 11:03:44 +01:00
parent b7d26c2e5c
commit a17ac09fd0
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -1002,7 +1002,7 @@ class AccountingJournal extends CommonObject
* @param string $account Accounting account number * @param string $account Accounting account number
* @return array Accounting account infos * @return array Accounting account infos
*/ */
function getAccountingAccountInfos($account) public function getAccountingAccountInfos($account)
{ {
if (!isset(self::$accounting_account_cached[$account])) { if (!isset(self::$accounting_account_cached[$account])) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

6
htdocs/accountancy/journal/variousjournal.php
View File

@ -121,10 +121,8 @@ if ($action == 'writebookkeeping') {
} }
$reload = true; $reload = true;
} } elseif ($action == 'exportcsv') {
// Export CSV
// Export
elseif ($action == 'exportcsv') {
$result = $object->exportCsv($journal_data, $date_end); $result = $object->exportCsv($journal_data, $date_end);
if ($result < 0) { if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');

5
htdocs/asset/card.php
View File

@ -253,9 +253,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Confirmation to delete // Confirmation to delete
if ($action == 'delete') { if ($action == 'delete') {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAsset'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAsset'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
} } elseif ($action == 'disposal') {
// Disposal // Disposal
elseif ($action == 'disposal') {
$langs->load('bills'); $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 $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

4
htdocs/asset/class/assetaccountancycodes.class.php
View File

@ -80,6 +80,8 @@ class AssetAccountancyCodes extends CommonObject
/** /**
* Fill accountancy_codes property of object (using for data sent by forms) * Fill accountancy_codes property of object (using for data sent by forms)
*
* @return array Array of values
*/ */
public function setAccountancyCodesFromPost() public function setAccountancyCodesFromPost()
{ {
@ -104,7 +106,7 @@ class AssetAccountancyCodes extends CommonObject
public function fetchAccountancyCodes($asset_id = 0, $asset_model_id = 0) public function fetchAccountancyCodes($asset_id = 0, $asset_model_id = 0)
{ {
global $langs, $hookmanager; 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; $error = 0;
$this->errors = array(); $this->errors = array();

4
htdocs/asset/model/card.php
View File

@ -221,8 +221,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Confirmation to delete // Confirmation to delete
if ($action == 'delete') { if ($action == 'delete') {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteAssetModel'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1); $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 // Create an array for form
$formquestion = array(); $formquestion = array();
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);