From b51ae8fd8dda52d3d688600f945784a1f7a7873f Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 3 Nov 2024 08:18:16 +0100 Subject: [PATCH 1/5] NEW Custom accounting reports --- htdocs/accountancy/admin/report_list.php | 828 ++++++++++++++++++ .../class/accountancyreport.class.php | 325 +++++++ htdocs/core/menus/init_menu_auguria.sql | 4 +- htdocs/core/menus/standard/eldy.lib.php | 5 +- htdocs/langs/en_US/accountancy.lang | 2 + htdocs/langs/en_US/admin.lang | 1 + 6 files changed, 1163 insertions(+), 2 deletions(-) create mode 100644 htdocs/accountancy/admin/report_list.php create mode 100644 htdocs/accountancy/class/accountancyreport.class.php diff --git a/htdocs/accountancy/admin/report_list.php b/htdocs/accountancy/admin/report_list.php new file mode 100644 index 0000000000000..5534dae650f0e --- /dev/null +++ b/htdocs/accountancy/admin/report_list.php @@ -0,0 +1,828 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/accountancy/admin/report_list.php + * \ingroup setup + * \brief Page to administer data tables + */ + +// Load Dolibarr environment +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyreport.class.php'; + +// Load translation files required by the page +$langs->loadLangs(array("errors", "admin", "companies")); + +$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; +$confirm = GETPOST('confirm', 'alpha'); +$id = 45; +$rowid = GETPOST('rowid', 'alpha'); +$code = GETPOST('code', 'alpha'); + +// Security access +if (!$user->hasRight('accounting', 'chartofaccount')) { + accessforbidden(); +} + +$acts = array(); +$acts[0] = "activate"; +$acts[1] = "disable"; +$actl = array(); +$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"'); +$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"'); + +$listoffset = GETPOST('listoffset', 'alpha'); +$listlimit = GETPOSTINT('listlimit') > 0 ? GETPOSTINT('listlimit') : 1000; + +$sortfield = GETPOST("sortfield", 'aZ09comma'); +$sortorder = GETPOST("sortorder", 'aZ09comma'); +$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); +if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { + // If $page is not defined, or '' or -1 or if we click on clear filters + $page = 0; +} +$offset = $listlimit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; + +$search_country_id = GETPOST('search_country_id', 'int'); + +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context +$hookmanager->initHooks(array('admin')); + +// This page is a generic page to edit dictionaries +// Put here declaration of dictionaries properties + +// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this. +$taborder = array(45); + +// Name of SQL tables of dictionaries +$tabname = array(); +$tabname[45] = MAIN_DB_PREFIX."c_accounting_report"; + +// Dictionary labels +$tablib = array(); +$tablib[45] = "DictionaryAccountancyReport"; + +// Requests to extract data +$tabsql = array(); +$tabsql[45] = "SELECT r.rowid as rowid, r.code as code, r.label, r.fk_country as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_accounting_report as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_country = c.rowid and c.active=1"; + +// Criteria to sort dictionaries +$tabsqlsort = array(); +$tabsqlsort[45] = "code ASC"; + +// Name of the fields in the result of select to display the dictionary +$tabfield = array(); +$tabfield[45] = "code,label,country"; + +// Name of editing fields for record modification +$tabfieldvalue = array(); +$tabfieldvalue[45] = "code,label,country_id"; + +// Name of the fields in the table for inserting a record +$tabfieldinsert = array(); +$tabfieldinsert[45] = "code,label,fk_country"; + +// Name of the rowid if the field is not of type autoincrement +// Example: "" if id field is "rowid" and has autoincrement on +// "nameoffield" if id field is not "rowid" or has not autoincrement on +$tabrowid = array(); +$tabrowid[45] = ""; + +// Condition to show dictionary in setup page +$tabcond = array(); +$tabcond[45] = isModEnabled('accounting'); + +// List of help for fields +$tabhelp = array(); +$tabhelp[45] = array('code' => $langs->trans("EnterAnyCode")); + +// List of check for fields (NOT USED YET) +$tabfieldcheck = array(); +$tabfieldcheck[45] = array(); + +// Complete all arrays with entries found into modules +complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck); + +$accountingreport = new AccountancyReport($db); + + +/* + * Actions + */ + +if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) { + $search_country_id = ''; +} + +// Actions add or modify an entry into a dictionary +if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) { + $listfield = explode(',', str_replace(' ', '', $tabfield[$id])); + $listfieldinsert = explode(',', $tabfieldinsert[$id]); + $listfieldmodify = explode(',', $tabfieldinsert[$id]); + $listfieldvalue = explode(',', $tabfieldvalue[$id]); + + // Check that all fields are filled + $ok = 1; + foreach ($listfield as $f => $value) { + if (($value == 'country' || $value == 'country_id') && GETPOST('country_id')) { + continue; + } + if (!GETPOSTISSET($value) || GETPOST($value) == '') { + $ok = 0; + $fieldnamekey = $listfield[$f]; + // We take translate key of field + if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) { + $fieldnamekey = 'Label'; + } + if ($fieldnamekey == 'code') { + $fieldnamekey = 'Code'; + } + if ($fieldnamekey == 'country') { + $fieldnamekey = 'Country'; + } + + setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors'); + } + } + if (GETPOSTISSET("code")) { + if (GETPOST("code") == '0') { + $ok = 0; + setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors'); + } + } + + // Si verif ok et action add, on ajoute la ligne + if ($ok && GETPOST('actionadd', 'alpha')) { + $newid = 0; + + if ($tabrowid[$id]) { + // Get free id for insert + $sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]); + $result = $db->query($sql); + if ($result) { + $obj = $db->fetch_object($result); + $newid = ($obj->newid + 1); + } else { + dol_print_error($db); + } + } + + // Add new entry + $sql = "INSERT INTO ".$db->sanitize($tabname[$id])." ("; + // List of fields + if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) { + $sql .= $db->sanitize($tabrowid[$id]).","; + } + $sql .= $db->sanitize($tabfieldinsert[$id]); + $sql .= ",active)"; + $sql .= " VALUES("; + + // List of values + if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) { + $sql .= $newid.","; + } + $i = 0; + foreach ($listfieldinsert as $f => $value) { + if ($value == 'entity') { + $_POST[$listfieldvalue[$i]] = $conf->entity; + } + if ($i) { + $sql .= ","; + } + if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'formula') { + $sql .= "null"; // For vat, we want/accept code = '' + } else { + $sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'"; + } + $i++; + } + $sql .= ",1)"; + + dol_syslog("actionadd", LOG_DEBUG); + $result = $db->query($sql); + if ($result) { // Add is ok + setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs'); + $_POST = array('id' => $id); // Clean $_POST array, we keep only + } else { + if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { + setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors'); + } else { + dol_print_error($db); + } + } + } + + // If check ok and action modify, we modify the line + if ($ok && GETPOST('actionmodify', 'alpha')) { + if ($tabrowid[$id]) { + $rowidcol = $tabrowid[$id]; + } else { + $rowidcol = "rowid"; + } + + // Modify entry + $sql = "UPDATE ".$db->sanitize($tabname[$id])." SET "; + // Modifie valeur des champs + if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) { + $sql .= $db->sanitize($tabrowid[$id])." = "; + $sql .= "'".$db->escape($rowid)."', "; + } + $i = 0; + foreach ($listfieldmodify as $field) { + if ($field == 'fk_country' && GETPOST('country') > 0) { + $_POST[$listfieldvalue[$i]] = GETPOST('country'); + } elseif ($field == 'entity') { + $_POST[$listfieldvalue[$i]] = $conf->entity; + } + if ($i) { + $sql .= ","; + } + $sql .= $field."="; + if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'range_account') { + $sql .= "null"; // For range_account, we want/accept code = '' + } else { + $sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'"; + } + $i++; + } + $sql .= " WHERE ".$rowidcol." = ".((int) $rowid); + + dol_syslog("actionmodify", LOG_DEBUG); + //print $sql; + $resql = $db->query($sql); + if (!$resql) { + setEventMessages($db->error(), null, 'errors'); + } + } +} + +if ($action == 'confirm_delete' && $confirm == 'yes') { // delete + $rowidcol = "rowid"; + + $sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid); + + dol_syslog("delete", LOG_DEBUG); + $result = $db->query($sql); + if (!$result) { + if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') { + setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors'); + } else { + dol_print_error($db); + } + } +} + +// activate +if ($action == $acts[0]) { + $sql = ''; + $rowidcol = "rowid"; + + if ($rowid) { + $sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid); + } elseif ($code) { + $sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE code = '".$db->escape($code)."'"; + } + + if ($sql) { + $result = $db->query($sql); + if (!$result) { + dol_print_error($db); + } + } +} + +// disable +if ($action == $acts[1]) { + $sql = ''; + $rowidcol = "rowid"; + + if ($rowid) { + $sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid); + } elseif ($code) { + $sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE code = '".$db->escape($code)."'"; + } + + if ($sql) { + $result = $db->query($sql); + if (!$result) { + dol_print_error($db); + } + } +} + +/* + * View + */ + +$form = new Form($db); +$formadmin = new FormAdmin($db); + +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $langs->trans('DictionaryAccountancyCategory'), $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-admin_categories_list'); + +$titre = $langs->trans($tablib[$id]); +$linkback = ''; +$titlepicto = 'setup'; + +print load_fiche_titre($titre, $linkback, $titlepicto); + +print ''.$langs->trans("AccountingAccountReportsDesc", $langs->transnoentitiesnoconv("ByPersonalizedAccountGroups")).'

'; + +// Confirmation of the deletion of the line +if ($action == 'delete') { + print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1); +} + +// Complete search query with sorting criteria +$sql = $tabsql[$id]; + +if ($search_country_id > 0) { + if (preg_match('/ WHERE /', $sql)) { + $sql .= " AND "; + } else { + $sql .= " WHERE "; + } + $sql .= " (r.fk_country = ".((int) $search_country_id)." OR r.fk_country = 0)"; +} + +// If sort order is "country", we use country_code instead +if ($sortfield == 'country') { + $sortfield = 'country_code'; +} + +$sql .= $db->order($sortfield, $sortorder); +$sql .= $db->plimit($listlimit + 1, $offset); + + +$fieldlist = explode(',', $tabfield[$id]); + +$param = '&id='.$id; +if ($search_country_id > 0) { + $param .= '&search_country_id='.urlencode((string) ($search_country_id)); +} +$paramwithsearch = $param; +if ($sortorder) { + $paramwithsearch .= '&sortorder='.urlencode($sortorder); +} +if ($sortfield) { + $paramwithsearch .= '&sortfield='.urlencode($sortfield); +} +if (GETPOST('from', 'alpha')) { + $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha')); +} +if ($listlimit) { + $paramwithsearch .= '&listlimit='.urlencode((string) (GETPOSTINT('listlimit'))); +} +print '
'; +print ''; +print ''; +print ''; +print ''; + + +print '
'; +print ''; + +// Form to add a new line +if ($tabname[$id]) { + $fieldlist = explode(',', $tabfield[$id]); + + // Line for title + print ''; + // Action column + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + foreach ($fieldlist as $field => $value) { + // Determine le nom du champ par rapport aux noms possibles + // dans les dictionnaires de donnees + $valuetoshow = ucfirst($fieldlist[$field]); // By default + $valuetoshow = $langs->trans($valuetoshow); // try to translate + $class = "left"; + if ($fieldlist[$field] == 'code') { + $valuetoshow = $langs->trans("Code"); + $class = 'width75'; + } + if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { + $valuetoshow = $langs->trans("Label"); + } + if ($fieldlist[$field] == 'country') { + $valuetoshow = $langs->trans("Country"); + } + + if ($valuetoshow != '') { + print ''; + } + } + + print ''; + print ''; + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + print ''; + + // Line to enter new values + print ''; + + // Action column + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + + $obj = new stdClass(); + // If data was already input, we define them in obj to populate input fields. + if (GETPOST('actionadd', 'alpha')) { + foreach ($fieldlist as $key => $val) { + if (GETPOST($val) != '') { + $obj->$val = GETPOST($val); + } + } + } + + $tmpaction = 'create'; + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); + $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks + $error = $hookmanager->error; + $errors = $hookmanager->errors; + + if (empty($reshook)) { + fieldListAccountingReport($fieldlist, $obj, $tabname[$id], 'add'); + } + + print ''; + + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + + print ""; + + $colspan = count($fieldlist) + 3; + if ($id == 45) { + $colspan++; + } +} + +print '
'; + if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) { + print ''.$valuetoshow.' '.img_help(1, $valuetoshow).''; + } elseif (!empty($tabhelp[$id][$value])) { + print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]); + } else { + print $valuetoshow; + } + print ''; + print ''; + print '
'; + print ''; + print '
'; +print '
'; + +print '
'; +print ''; + +// List of available record in database +dol_syslog("htdocs/accountancy/admin/categories_list.php", LOG_DEBUG); + +$resql = $db->query($sql); +if ($resql) { + $num = $db->num_rows($resql); + $i = 0; + + // There is several pages + if ($num > $listlimit) { + print ''; + } + + $filterfound = 0; + foreach ($fieldlist as $field => $value) { + $showfield = 1; // By default + if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { + $showfield = 0; + } + if ($showfield) { + if ($value == 'country') { + $filterfound++; + } + } + } + + // Title line with search boxes + print ''; + + // Action column + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + + $filterfound = 0; + foreach ($fieldlist as $field => $value) { + $showfield = 1; // By default + + if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { + $showfield = 0; + } + + if ($showfield) { + if ($value == 'country') { + print ''; + $filterfound++; + } else { + print ''; + } + } + } + print ''; + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + print ''; + + // Title of lines + print ''; + // Action column + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print getTitleFieldOfList(''); + } + foreach ($fieldlist as $field => $value) { + // Determines the name of the field in relation to the possible names + // in data dictionaries + $showfield = 1; // By default + $class = "left"; + $sortable = 1; + $valuetoshow = ''; + + $valuetoshow = ucfirst($fieldlist[$field]); // By default + $valuetoshow = $langs->trans($valuetoshow); // try to translate + if ($fieldlist[$field] == 'code') { + $valuetoshow = $langs->trans("Code"); + } + if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { + $valuetoshow = $langs->trans("Label"); + } + if ($fieldlist[$field] == 'country') { + $valuetoshow = $langs->trans("Country"); + } + if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { + $showfield = 0; + } + // Affiche nom du champ + if ($showfield) { + print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' '); + } + } + print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, 'center '); + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print getTitleFieldOfList(''); + } + print ''; + + + if ($num) { + $imaxinloop = ($listlimit ? min($num, $listlimit) : $num); + + // Lines with values + while ($i < $imaxinloop) { + $obj = $db->fetch_object($resql); + + //print_r($obj); + print ''; + if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) { + $tmpaction = 'edit'; + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); + $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks + $error = $hookmanager->error; + $errors = $hookmanager->errors; + + // Actions + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + + // Show fields + if (empty($reshook)) { + fieldListAccountingReport($fieldlist, $obj, $tabname[$id], 'edit'); + } + + print ''; + print ''; + // Actions + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + } else { + // Can an entry be erased or disabled ? + $iserasable = 1; + $canbedisabled = 1; + $canbemodified = 1; // true by default + if (isset($obj->code)) { + if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { + $iserasable = 0; + $canbedisabled = 0; + } + } + $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : ''); + if ($param) { + $url .= '&'.$param; + } + $url .= '&'; + + $canbemodified = $iserasable; + + $tmpaction = 'view'; + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); + $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks + + $error = $hookmanager->error; + $errors = $hookmanager->errors; + + // Actions + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + + if (empty($reshook)) { + foreach ($fieldlist as $field => $value) { + $showfield = 1; + $title = ''; + $class = 'tddict'; + + $tmpvar = $fieldlist[$field]; + $valuetoshow = $obj->$tmpvar; + if ($valuetoshow == 'all') { + $valuetoshow = $langs->trans('All'); + } elseif ($fieldlist[$field] == 'country') { + if (empty($obj->country_code)) { + $valuetoshow = '-'; + } else { + $key = $langs->trans("Country".strtoupper($obj->country_code)); + $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country); + } + } elseif (in_array($fieldlist[$field], array('label'))) { + $class = "tdoverflowmax250"; + $title = $valuetoshow; + } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { + $showfield = 0; + } + + // Show value for field + if ($showfield) { + print ''; + } + } + } + + // Active + print '"; + + // Actions + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } + } + print "\n"; + $i++; + } + } else { + $colspan = 10; + print ''; + } +} else { + dol_print_error($db); +} + +print '
'; + print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), ''); + print '
'; + if ($filterfound) { + $searchpicto = $form->showFilterAndCheckAddButtons(0); + print $searchpicto; + } + print ''; + print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone'); + print ''; + if ($filterfound) { + $searchpicto = $form->showFilterAndCheckAddButtons(0); + print $searchpicto; + } + print '
'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print '		'; + if ($canbemodified) { + print ''.img_edit().''; + } + if ($iserasable) { + if ($user->admin) { + print ''.img_delete().''; + } + } + print ''.dol_escape_htmltag($valuetoshow).''; + if ($canbedisabled) { + print ''.$actl[$obj->active].''; + } else { + print $langs->trans("AlwaysActive"); + } + print "'; + if ($canbemodified) { + print ''.img_edit().''; + } + if ($iserasable) { + if ($user->admin) { + print ''.img_delete().''; + } + } + print '
'.$langs->trans("None").'
'; +print '
'; + +print '
'; + +print '
'; + +// End of page +llxFooter(); +$db->close(); + + +/** + * Show fields in insert/edit mode + * + * @param string[] $fieldlist Array of fields + * @param ?stdClass $obj If we show a particular record, obj is filled with record fields + * @param string $tabname Name of SQL table + * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered + * @return void + */ +function fieldListAccountingReport($fieldlist, $obj = null, $tabname = '', $context = '') +{ + global $db; + global $form, $mysoc; + + $formadmin = new FormAdmin($db); + $formcompany = new FormCompany($db); + + foreach ($fieldlist as $field => $value) { + if ($fieldlist[$field] == 'country') { + print ''; + $fieldname = 'country'; + if ($context == 'add') { + $fieldname = 'country_id'; + $preselectcountrycode = GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $mysoc->country_code; + print $form->select_country($preselectcountrycode, $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone'); + } else { + $preselectcountrycode = (empty($obj->country_code) ? (empty($obj->country) ? $mysoc->country_code : $obj->country) : $obj->country_code); + print $form->select_country($preselectcountrycode, $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone'); + } + print ''; + } elseif ($fieldlist[$field] == 'country_id') { + if (!in_array('country', $fieldlist)) { // If there is already a field country, we don't show country_id (avoid duplicate) + $country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0); + print ''; + print ''; + print ''; + } + } elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) { + print ''; + } else { + print ''; + $class = ''; + if (in_array($fieldlist[$field], array('label'))) { + $class = 'maxwidth150'; + } + print ''; + print ''; + } + } +} diff --git a/htdocs/accountancy/class/accountancyreport.class.php b/htdocs/accountancy/class/accountancyreport.class.php new file mode 100644 index 0000000000000..d05cf6f8f9e88 --- /dev/null +++ b/htdocs/accountancy/class/accountancyreport.class.php @@ -0,0 +1,325 @@ + + * Copyright (C) 2016-2017 Alexandre Spangaro + * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2024 MDW + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/accountancy/class/accountancyreport.class.php + * \ingroup Accountancy (Double entries) + * \brief File of class to manage reports for accounting categories + */ + +// Class +require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; + +/** + * Class to manage reports for accounting categories + */ +class AccountancyReport // extends CommonObject +{ + /** + * @var DoliDB Database handler. + */ + public $db; + + /** + * @var string Error string + */ + public $error; + + /** + * @var string[] Error codes (or messages) + */ + public $errors = array(); + + /** + * @var string ID to identify managed object + */ + public $element = 'c_accounting_report'; + + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element = 'c_accounting_report'; + + /** + * @var int ID + * @deprecated + */ + public $rowid; + + /** + * @var int ID + */ + public $id; + + /** + * @var string Accountancy code + */ + public $code; + + /** + * @var string Accountancy Category label + */ + public $label; + + /** + * @var int country id + */ + public $fk_country; + + /** + * @var int Is active + */ + public $active; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + public function __construct($db) + { + $this->db = $db; + } + + + /** + * Create object into database + * + * @param User $user User that create + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int Return integer <0 if KO, Id of created object if OK + */ + public function create($user, $notrigger = 0) + { + global $conf, $langs; + $error = 0; + + // Clean parameters + if (isset($this->code)) { + $this->code = trim($this->code); + } + if (isset($this->label)) { + $this->label = trim($this->label); + } + if (isset($this->fk_country)) { + $this->fk_country = (int)$this->fk_country; + } + if (isset($this->active)) { + $this->active = (int)$this->active; + } + + // Check parameters + // Put here code to add control on parameters values + + // Insert request + $sql = "INSERT INTO " . $this->db->prefix() . $this->table_element . " ("; + if ($this->rowid > 0) { + $sql .= "rowid, "; + } + $sql .= "code, "; + $sql .= "label, "; + $sql .= "fk_country, "; + $sql .= "active, "; + $sql .= "entity"; + $sql .= ") VALUES ("; + if ($this->rowid > 0) { + $sql .= " " . ((int)$this->rowid) . ","; + } + $sql .= " " . (!isset($this->code) ? "NULL" : "'" . $this->db->escape($this->code) . "'") . ","; + $sql .= " " . (!isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'") . ","; + $sql .= " " . (!isset($this->fk_country) ? 'NULL' : ((int)$this->fk_country)) . ","; + $sql .= " " . (!isset($this->active) ? 'NULL' : ((int)$this->active)); + $sql .= ", " . ((int)$conf->entity); + $sql .= ")"; + + $this->db->begin(); + + dol_syslog(get_class($this) . "::create", LOG_DEBUG); + $resql = $this->db->query($sql); + if (!$resql) { + $error++; + $this->errors[] = "Error " . $this->db->lasterror(); + } + + // Commit or rollback + if ($error) { + foreach ($this->errors as $errmsg) { + dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR); + $this->error .= ($this->error ? ', ' . $errmsg : $errmsg); + } + $this->db->rollback(); + return -1 * $error; + } else { + $this->db->commit(); + return $this->id; + } + } + + + /** + * Load object in memory from database + * + * @param int $id Id object + * @param string $code Code + * @param string $label Label + * @return int Return integer <0 if KO, >0 if OK + */ + public function fetch($id, $code = '', $label = '') + { + $sql = "SELECT"; + $sql .= " t.rowid,"; + $sql .= " t.code,"; + $sql .= " t.label,"; + $sql .= " t.fk_country,"; + $sql .= " t.active"; + $sql .= " FROM " . $this->db->prefix() . $this->table_element . " as t"; + if ($id) { + $sql .= " WHERE t.rowid = " . ((int)$id); + } else { + $sql .= " WHERE t.entity IN (" . getEntity('c_accounting_report') . ")"; // Don't use entity if you use rowid + if ($code) { + $sql .= " AND t.code = '" . $this->db->escape($code) . "'"; + } elseif ($label) { + $sql .= " AND t.label = '" . $this->db->escape($label) . "'"; + } + } + + dol_syslog(get_class($this) . "::fetch", LOG_DEBUG); + $resql = $this->db->query($sql); + if ($resql) { + if ($this->db->num_rows($resql)) { + $obj = $this->db->fetch_object($resql); + + $this->id = $obj->rowid; + $this->code = $obj->code; + $this->label = $obj->label; + $this->fk_country = $obj->fk_country; + $this->active = $obj->active; + } + $this->db->free($resql); + + return 1; + } else { + $this->error = "Error " . $this->db->lasterror(); + return -1; + } + } + + + /** + * Update object into database + * + * @param User $user User that modify + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int Return integer <0 if KO, >0 if OK + */ + public function update($user = null, $notrigger = 0) + { + global $conf, $langs; + $error = 0; + + // Clean parameters + if (isset($this->code)) { + $this->code = trim($this->code); + } + if (isset($this->label)) { + $this->label = trim($this->label); + } + if (isset($this->fk_country)) { + $this->fk_country = (int)$this->fk_country; + } + if (isset($this->active)) { + $this->active = (int)$this->active; + } + + + // Check parameters + // Put here code to add control on parameters values + + // Update request + $sql = "UPDATE " . $this->db->prefix() . $this->table_element . " SET"; + $sql .= " code=" . (isset($this->code) ? "'" . $this->db->escape($this->code) . "'" : "null") . ","; + $sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ","; + $sql .= " fk_country=" . (isset($this->fk_country) ? ((int)$this->fk_country) : "null") . ","; + $sql .= " active=" . (isset($this->active) ? ((int)$this->active) : "null"); + $sql .= " WHERE rowid=" . ((int)$this->id); + + $this->db->begin(); + + dol_syslog(get_class($this) . "::update", LOG_DEBUG); + $resql = $this->db->query($sql); + if (!$resql) { + $error++; + $this->errors[] = "Error " . $this->db->lasterror(); + } + + // Commit or rollback + if ($error) { + foreach ($this->errors as $errmsg) { + dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR); + $this->error .= ($this->error ? ', ' . $errmsg : $errmsg); + } + $this->db->rollback(); + return -1 * $error; + } else { + $this->db->commit(); + return 1; + } + } + + + /** + * Delete object in database + * + * @param User $user User that delete + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int Return integer <0 if KO, >0 if OK + */ + public function delete($user, $notrigger = 0) + { + global $conf, $langs; + $error = 0; + + $sql = "DELETE FROM " . $this->db->prefix() . $this->table_element; + $sql .= " WHERE rowid=" . ((int)$this->id); + + $this->db->begin(); + + dol_syslog(get_class($this) . "::delete", LOG_DEBUG); + $resql = $this->db->query($sql); + if (!$resql) { + $error++; + $this->errors[] = "Error " . $this->db->lasterror(); + } + + // Commit or rollback + if ($error) { + foreach ($this->errors as $errmsg) { + dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR); + $this->error .= ($this->error ? ', ' . $errmsg : $errmsg); + } + $this->db->rollback(); + return -1 * $error; + } else { + $this->db->commit(); + return 1; + } + } +} diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index ac28012d92a77..4ed15c0561fba 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -312,7 +312,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("expensereport") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 54, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product', 2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 55, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure', 2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 70, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group', 2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 80, __ENTITY__); + +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2470__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_report_group', 2451__+MAX_llx_menu__, '/accountancy/admin/report_list.php?id=45&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingReport', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 75, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2471__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group', 2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 80, __ENTITY__); -- Binding insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 2, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 4ce4aa1d7977c..5f2a40953c178 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1700,7 +1700,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef } $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110); $newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120); - $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125); + if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { + $newmenu->add("/accountancy/admin/report_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingReport"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125); + } + $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 130); } // Transfer in accounting diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index e7ae1623daedf..8233f08c9ddb1 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -219,10 +219,12 @@ Codejournal=Journal JournalLabel=Journal label NumPiece=Piece number TransactionNumShort=Num. transaction +AccountingReport=Custom reports AccountingCategory=Custom group of accounts AccountingCategories=Custom groups of accounts GroupByAccountAccounting=Group by general ledger account GroupBySubAccountAccounting=Group by subledger account +AccountingAccountReportsDesc=You can define here some reports of accounting account. They will be used for personalized accounting reports. AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 747872fd2d78f..f9067bbc5184c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1106,6 +1106,7 @@ DictionaryStaff=Number of Employees DictionaryAvailability=Delivery delay DictionaryOrderMethods=Order methods DictionarySource=Origin of proposals/orders +DictionaryAccountancyReport=Personalized accounting reports DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals From 3f96fe86baebc65ed589b618fb95e73a01128a63 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 3 Nov 2024 08:26:43 +0100 Subject: [PATCH 2/5] Copyright --- .../class/accountancyreport.class.php | 5 +---- htdocs/core/menus/standard/eldy.lib.php | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/class/accountancyreport.class.php b/htdocs/accountancy/class/accountancyreport.class.php index d05cf6f8f9e88..b0a1ff4ad556f 100644 --- a/htdocs/accountancy/class/accountancyreport.class.php +++ b/htdocs/accountancy/class/accountancyreport.class.php @@ -1,8 +1,5 @@ - * Copyright (C) 2016-2017 Alexandre Spangaro - * Copyright (C) 2018-2024 Frédéric France - * Copyright (C) 2024 MDW +/* Copyright (C) 2024 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 5f2a40953c178..2c85f9b9eeadb 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1,13 +1,14 @@ - * Copyright (C) 2010-2024 Regis Houssin - * Copyright (C) 2012-2015 Juanjo Menent - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2015 Marcos García - * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2018-2024 Frédéric France - * Copyright (C) 2021 Gauthier VERDOL - * Copyright (C) 2024 MDW +/* Copyright (C) 2010-2022 Laurent Destailleur + * Copyright (C) 2010-2024 Regis Houssin + * Copyright (C) 2012-2015 Juanjo Menent + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Marcos García + * Copyright (C) 2018 Ferran Marcet + * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2021 Gauthier VERDOL + * Copyright (C) 2024 MDW + * Copyright (C) 2024 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From b624029997ba4072ff49b72ffae41ade44368f7b Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 3 Nov 2024 08:32:15 +0100 Subject: [PATCH 3/5] FIX Pre-commit --- htdocs/accountancy/admin/report_list.php | 8 ++++---- .../class/accountancyreport.class.php | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/admin/report_list.php b/htdocs/accountancy/admin/report_list.php index 5534dae650f0e..cad1751da4d0e 100644 --- a/htdocs/accountancy/admin/report_list.php +++ b/htdocs/accountancy/admin/report_list.php @@ -642,10 +642,10 @@ print ''; } - // Show fields - if (empty($reshook)) { - fieldListAccountingReport($fieldlist, $obj, $tabname[$id], 'edit'); - } + // Show fields + if (empty($reshook)) { + fieldListAccountingReport($fieldlist, $obj, $tabname[$id], 'edit'); + } print ''; print ''; diff --git a/htdocs/accountancy/class/accountancyreport.class.php b/htdocs/accountancy/class/accountancyreport.class.php index b0a1ff4ad556f..fa9dcf1f951e5 100644 --- a/htdocs/accountancy/class/accountancyreport.class.php +++ b/htdocs/accountancy/class/accountancyreport.class.php @@ -116,10 +116,10 @@ public function create($user, $notrigger = 0) $this->label = trim($this->label); } if (isset($this->fk_country)) { - $this->fk_country = (int)$this->fk_country; + $this->fk_country = (int) $this->fk_country; } if (isset($this->active)) { - $this->active = (int)$this->active; + $this->active = (int) $this->active; } // Check parameters @@ -137,13 +137,13 @@ public function create($user, $notrigger = 0) $sql .= "entity"; $sql .= ") VALUES ("; if ($this->rowid > 0) { - $sql .= " " . ((int)$this->rowid) . ","; + $sql .= " " . ((int) $this->rowid) . ","; } $sql .= " " . (!isset($this->code) ? "NULL" : "'" . $this->db->escape($this->code) . "'") . ","; $sql .= " " . (!isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'") . ","; $sql .= " " . (!isset($this->fk_country) ? 'NULL' : ((int)$this->fk_country)) . ","; $sql .= " " . (!isset($this->active) ? 'NULL' : ((int)$this->active)); - $sql .= ", " . ((int)$conf->entity); + $sql .= ", " . ((int) $conf->entity); $sql .= ")"; $this->db->begin(); @@ -188,7 +188,7 @@ public function fetch($id, $code = '', $label = '') $sql .= " t.active"; $sql .= " FROM " . $this->db->prefix() . $this->table_element . " as t"; if ($id) { - $sql .= " WHERE t.rowid = " . ((int)$id); + $sql .= " WHERE t.rowid = " . ((int) $id); } else { $sql .= " WHERE t.entity IN (" . getEntity('c_accounting_report') . ")"; // Don't use entity if you use rowid if ($code) { @@ -240,10 +240,10 @@ public function update($user = null, $notrigger = 0) $this->label = trim($this->label); } if (isset($this->fk_country)) { - $this->fk_country = (int)$this->fk_country; + $this->fk_country = (int) $this->fk_country; } if (isset($this->active)) { - $this->active = (int)$this->active; + $this->active = (int) $this->active; } @@ -256,7 +256,7 @@ public function update($user = null, $notrigger = 0) $sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ","; $sql .= " fk_country=" . (isset($this->fk_country) ? ((int)$this->fk_country) : "null") . ","; $sql .= " active=" . (isset($this->active) ? ((int)$this->active) : "null"); - $sql .= " WHERE rowid=" . ((int)$this->id); + $sql .= " WHERE rowid=" . ((int) $this->id); $this->db->begin(); @@ -295,7 +295,7 @@ public function delete($user, $notrigger = 0) $error = 0; $sql = "DELETE FROM " . $this->db->prefix() . $this->table_element; - $sql .= " WHERE rowid=" . ((int)$this->id); + $sql .= " WHERE rowid=" . ((int) $this->id); $this->db->begin(); From 11e7405f2f550f646fc425d8ba9cb316d62badaf Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 3 Nov 2024 08:36:25 +0100 Subject: [PATCH 4/5] FIX Pre-commit --- htdocs/accountancy/class/accountancyreport.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/class/accountancyreport.class.php b/htdocs/accountancy/class/accountancyreport.class.php index fa9dcf1f951e5..8c052ef9e87eb 100644 --- a/htdocs/accountancy/class/accountancyreport.class.php +++ b/htdocs/accountancy/class/accountancyreport.class.php @@ -141,8 +141,8 @@ public function create($user, $notrigger = 0) } $sql .= " " . (!isset($this->code) ? "NULL" : "'" . $this->db->escape($this->code) . "'") . ","; $sql .= " " . (!isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'") . ","; - $sql .= " " . (!isset($this->fk_country) ? 'NULL' : ((int)$this->fk_country)) . ","; - $sql .= " " . (!isset($this->active) ? 'NULL' : ((int)$this->active)); + $sql .= " " . (!isset($this->fk_country) ? 'NULL' : ((int) $this->fk_country)) . ","; + $sql .= " " . (!isset($this->active) ? 'NULL' : ((int) $this->active)); $sql .= ", " . ((int) $conf->entity); $sql .= ")"; @@ -254,8 +254,8 @@ public function update($user = null, $notrigger = 0) $sql = "UPDATE " . $this->db->prefix() . $this->table_element . " SET"; $sql .= " code=" . (isset($this->code) ? "'" . $this->db->escape($this->code) . "'" : "null") . ","; $sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ","; - $sql .= " fk_country=" . (isset($this->fk_country) ? ((int)$this->fk_country) : "null") . ","; - $sql .= " active=" . (isset($this->active) ? ((int)$this->active) : "null"); + $sql .= " fk_country=" . (isset($this->fk_country) ? ((int) $this->fk_country) : "null") . ","; + $sql .= " active=" . (isset($this->active) ? ((int) $this->active) : "null"); $sql .= " WHERE rowid=" . ((int) $this->id); $this->db->begin(); From e572077f567b1735acf4ed627956a590428b6cee Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 4 Nov 2024 16:04:10 +0100 Subject: [PATCH 5/5] Fix Phan --- htdocs/admin/company.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index cb8a7bdee6151..b1204b1e2e4c9 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -524,6 +524,7 @@ } // Tooltip for both Logo and LogSquarred +$maxmin = 0; $tooltiplogo = $langs->trans('AvailableFormats').' : png, jpg, jpeg'; $tooltiplogo .= ($maxmin > 0) ? '
'.$langs->trans('MaxSize').' : '.$maxmin.' '.$langs->trans('Kb') : '';