Resolve stickler-ci
This commit is contained in:
parent
b7d26c2e5c
commit
a17ac09fd0
@ -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';
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user