mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-14 06:16:54 +01:00
* CSS * CSS * Fix phpunit * More legal info * CI * Fix CI * Fix: IRPF tax not applied when creating invoice from project times (#37077) * Remove 'supplier_invoice' from old path array * Update module path in arrayforoldpath Sorry Eldy, I was confused. You are absolutely right, it is already corrected. * Replace localtax2 assignment with get_localtax function Error when creating an invoice with personal income tax from project times. The rate does not apply * Refactor localtax1 calculation using get_localtax --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix: IRPF tax not applied when creating invoice from project times (#37077) * Remove 'supplier_invoice' from old path array * Update module path in arrayforoldpath Sorry Eldy, I was confused. You are absolutely right, it is already corrected. * Replace localtax2 assignment with get_localtax function Error when creating an invoice with personal income tax from project times. The rate does not apply * Refactor localtax1 calculation using get_localtax --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Protect module * Add currency * CSS * WIP LNE * Fix navigation * cs * Debug registration process * Debug setup navigation * CI * CI * Factorize code * Fix CI * Fix CI * Fix CI * CI * CI * CI * CI * Disable phan on v23 * CI * CI * FIX: missing include for blockedlog lib (#37165) * Debug CI * fix ternary always true (#37161) * fix ternary always true * Update requests.php * Update registration.php --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * CI * FIX: missing include for blockedlog lib (#37165) * FIX #37134 Use json_encode for IMAP search logging in EmailCollector (#37135) var_export() produces multiline output that breaks log aggregators (Loki, Splunk, Elasticsearch) as each line becomes a separate log entry. Using json_encode() produces single-line structured output that works correctly with all log aggregation tools. Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Populate syslog with placeholder (#37163) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Doc * datamodel for user change password next time (#37155) * Qual: Update phan baseline (#37172) * Fix typo in file path (#37160) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix phpunit * Complete call to setStatus so we have a trigy as 4th parameter (help to fix the #37129) * FIX Product - Warning on admin (#37157) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * FIX Product - Warning on admin + CSS (#37158) * FIX Product - Warning on admin * CSS --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * CI * CI * CI * Avoid error if include fails * More functions in blacklist (even if nw we use the whitelist by default) * #37166 [SQL] add: email template for ticket admin creation (#37182) * Replace var_export with new function formatLogObject (#37178) * FIX BOM - Class product missing, column offset and information recording (form/input overlap) in admin (#37177) * FIX BOM - Class product missing in admin * Fix column offset and information recording (form/input overlap) * ci * ci * FIX Intracommreport - Warning & link problem on tab (#37176) * FIX Bank transfer admin - Warning & save 0 on constant PAYMENTBYBANKTRANSFER_ADDDAYS (#37175) * Look and feel v24 * Update default time handling in index.php (#37150) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix file path comment in supplier invoice module (#37133) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix file path comment in supplier invoice module (#37133) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix CI * Add template in migration * fix phpdoc comment (#37184) * fix phpdoc comment * fix phpdoc comment --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * CI * Fix phpstan * Replace var_export by formatLogObject (continued) (#37188) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Debug amount suggested on membership public form * Issue 36923 Fix session title handling in survey creation (#37105) * Issue 36923 Fix session title handling in survey creation * Change input field to use id attribute for title --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * fix phpstan errors blocking action baseline (#37189) * fix phpstan errors blocking action baseline * fix phpstan errors blocking action baseline * fix phpstan errors blocking action baseline * fix phpstan errors blocking action baseline * fix phpstan errors blocking action baseline * refresh baseline * QUAL Replace var_export() with json_encode() in dol_syslog() calls (#37138) var_export() produces multiline output that breaks log aggregators (Loki, Splunk, Elasticsearch, Graylog) as each line becomes a separate log entry. json_encode() produces single-line structured output that works correctly with all log aggregation tools. This pattern is already used elsewhere in Dolibarr (accountancy, install modules). Files changed: - core/class/commoninvoice.class.php (payment intent logging) - core/class/commonobject.class.php (payment terms logging) - core/modules/mailings/advthirdparties.modules.php (mailing targets) - core/modules/oauth/google_oauthcallback.php (userinfo logging) - core/modules/oauth/generic_oauthcallback.php (userinfo logging) - public/payment/newpayment.php (GET/POST debug logging) - public/payment/paymentok.php (payment tag logging) - public/stripe/ipn.php (Stripe event data logging) - paypal/lib/paypal.lib.php (PayPal response logging) - api/index.php (API debug logging) - stripe/class/stripe.class.php (payment/setup intent logging) Co-authored-by: f-hoedl <hoefla14@htl-kaindorf.ac.at> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix CI * CI * Check if upload_max_filesize is not empty * clean code * Debug v23 * CI * Fix #33521 VAT total false (#36990) * - Fix #33521 VAT total false - Fix some warnings - Fix : delete $this->vat_rate * - Fix #33521 VAT total false - Fix some warnings - Fix :delete $this->tva array (replaced by $this->tva_array) * - Fix #33521 VAT total false - Fix some warnings - Fix :delete $this->tva array (replaced by $this->tva_array) * Update pdf_octopus.modules.php * Update pdf_octopus.modules.php * Update pdf_octopus.modules.php * Update pdf_octopus.modules.php * Update pdf_octopus.modules.php --------- Co-authored-by: vmaury <vmaury@vmaury-Lafite-Pro-16-AMD> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * NEW #25829 Automatically send the invoice generated from a template (#36967) * Update DB * ADD email template * Ajout d'une clé de trad * Ajout des traductions * Suppression des traductions, sauf en_US * Add flag auto send * Modif form + cron auto send * Suppression auto_send * correction loopError * ajout du selected au model de mail * Prise en compte default model * Fix pre-commit * ménage * precommit * Correction Phan * Correction Phan * Correction, double cal du trigger --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Develop force user change pass userclass (#37174) * datamodel for user change password next time * add force_pass_change in user object * Initialize force_pass_change to 0 --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Another step for #37171 * Qual: Partial phan run on PR's, complete run on integration branches (#37186) * Qual: Partial phan run on PR's, complete on main # Qual: Partial phan run on PR's, complete on main The selection is based on the branch name. To run a complete phan run in a PR, the branch name of the PR must include phan_full. This can help to fix remaining phan issue before re-integrating to the develop branch. * qual: Update workflow and pre-commit configurations - Enable phan workflow by uncommenting the relevant lines - Update actionlint version to v1.7.10 - Add manual stage to actionlint hook in pre-commit-config.yaml * qual: Update Phan analysis conditions The conditions for running Phan analysis have been updated to include an additional check for branches containing 'phan_full'. * qual: Update Phan workflow - Replace github.event.ref with github.ref_name - Add FILE_CHANGE_LIST environment variable for better file handling - Update file list creation and usage in the workflow * qual: Update Phan workflow conditions Fix the branch reference (head_ref in PR, ref_name otherwise) * Add step for debug information * Remove debug step * Fix: Missing initialisations members/new.php Following a suppression of assignments, the variables disabledphy and disabledmor were undefined. * fix: Update budget selection dropdown arguments in member creation form Correct the arguments in the member creation form. * qual: Add cs2pr to phan workflow - Add cs2pr to the tools list in the phan workflow - Change the output mode of phan to checkstyle - Add a step to add results to PR as Github notices - Add a step to provide phan log as artifact * qual: Update Phan workflow to use environment variable for file list The change fixes the Phan workflow to use the environment variable `$FILE_CHANGED_LIST` to clear the file --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix phan * Fix phan * Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 * Doc * Qual: Fix ambigious redirect error on Phan workflow (#37200) # Qual: Fix ambigious redirect error on Phan workflow Rewrote the shell command that is supposed to suppress a file contents but is flagged by the environment. * PHPStan > Update baseline (#37197) Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com> * Typo fix (#37195) * Debug v23 - filters on agenda pages * css * css * css * qual: Update PHPStan workflow to run on all files in integration (#37207) The PHPStan workflow has been updated to run on all files in integration branches. * Fix CI * Add hook in isEditable() * Debug v23 * CLOSE #37190 ODT Templates for thirdparties - Birthday is returned in epoch format (#37198) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * fix: Remove HTML from accounting menu tooltips in eldy theme (#37203) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Qual: Update spelling (#37199) * Qual: Update spelling for pre-select variants # Qual: Update spelling for pre-select variants In English, preselect is without the hyphen. Update text and made some translations related to preselect. * Qual: Update composant to component and/or adequate translation. # Qual: Update composant to component and/or adequate translation. "Composant(s)" was mostly referenced in french file/class comments. Updated * Qual: Fix misspellings related to "criteria" # Qual: Fix misspellings related to "criteria" * Qual: Fix produt misspellings # Qual: Fix produt misspellings Change 'produt' to 'product'. * Qual: Update French comments with "composants" #Qual: Update French comments with "composants" - Translating French comments to English (avoid codespell notice) * Qual: Fixed typo 'bad practive' to 'bad practice' # Qual: Fixed typo 'bad practive' to 'bad practice' * Qual: Update phan.yml to exclude specific files from analysis - Added file exclusion pattern to match phan configuration - Added check for empty file list to avoid unnecessary phan execution * Qual: Update file filtering in phan.yml workflow The change updates the file filtering process in the phan.yml workflow to correctly redirect the output of the grep command to a temporary file. * Qual: Ignore $systemfunction always exists --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Error handling methods for commonobject (#37201) * Error handling methods for commonobject (#37201) * NEW Can request and force user to change its password (#37196) * force user to change password : redirect to user card on login * force user to change password : redirect to user card on login * redirect to a dedicated page * bad old idea : self change passwd on user card + edit mode and rights: it makes a hole on security check * only apply on dolibarr auth mode context * only on dolibarr auth mode context * Fix force_pass_change SQL assignment logic --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Doc * Setup easier to understand between INVOICE_CHECK_POSTERIOR_DATE and FAC_FORCE_DATE_VALIDATION * Setup easier to understand between INVOICE_CHECK_POSTERIOR_DATE and FAC_FORCE_DATE_VALIDATION * Prepare 23.0 * Qual: Ignore exit code from `grep -v` in phan flow (#37213) # Qual: Ignore exit code from `grep -v` in phan flow `grep -v` returns 1 when the resulting filtered list is empty and would stop the execution. This is fixed with `|| true` to have a final exit code that is 0. * WIP LNE * Debug v23 * Debug v23 * WIP LNE * FIX Bad header name * Fix CSP for ping * Compatibility with multicompany * Debug * Fix include * FIX phpdoc on createFixedAmountDiscount() (#37212) * FIX phpdoc on createFixedAmountDiscount * FIX phpdoc --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * Fix in card css modal display (#36569) * Fix display of cards in a modal * fix php stan * fix php stan * Try a change to force CI --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * NEW Accountancy - Multi reports system * Button style * CI * CI * CI * CI * CI * CI * CI * More complete data on pings. * Debug v23 * Debug initdemo * Debug initdemo * Debug initdemo * Debug v23 * Update initdemo * Update initdemo * Cleaner GET call * Add id of perm in url * Init demo for v24 * Fix translation of "various payment" (not english, not pro) with the term used in english to mean "Opérations diverses (OD)" * Sync transifex * CSS * Trans * Doc * Trans * Debug v23 * Debug v23 * Trans * Debug v24 * Debug v23 * Debug v23 * WIP * Debug v23 * Debug v23 * Debug v24 * Work on LNE * WIP LNE * Debug v24 * Doc * Translation * Sync transifex * Debug * Debug * Debug * Responsive * Dev control archive integrity * Debug * Update supplier_proposal.lang (#37238) * add company name on dropdown contract list (#37245) * Clean dump file * Fix CI * FIX #37246 Modifying resteapayer calculation for credit note (#37247) * Add 'type' parameter to completeTabsHead hook (#37235) * #37257 FIX for piesemicircle (#37258) * Fix #37227 Fix #37233 * Fix #37227 Fix #37233 * QUAL French comment in English (#37225) * Edit label of $fields * QUAL French comment in English * Bump actions/upload-artifact from 4 to 6 (#37250) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * UI/UX : Transfert feedback css from experimental to core (#37226) * Transfert feedback css from experimental to core * fix php phan * Fix phan * Fix phan * Fix phan * Missing label * Debug * Add method to chech if invoice can be replaced * Fix return * Debug v24 * Fix CI * fix commoninvoice.class.php (#37267) * fix commoninvoice.class.php * Update commoninvoice.class.php * CI * CI * Debug v23 * CI * Fix CI * Debug v23 * clean code pdf.lib.php (#37265) * clean code pdf.lib.php * Update pdf.lib.php * Update pdf.lib.php --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> * FixCI * FIX: linktoref should be able to receive more than 255 chars (#37262) Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net> Co-authored-by: Yamil Esteban Garcia <120027058+developmentOYR@users.noreply.github.com> Co-authored-by: Noé Cendrier <81741011+altairis-noe@users.noreply.github.com> Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com> Co-authored-by: minimexat <minimexat@gmail.com> Co-authored-by: hansemschnokeloch <hansemschnokeloch@users.noreply.github.com> Co-authored-by: Eric - CAP-REL <1468823+rycks@users.noreply.github.com> Co-authored-by: MDW <mdeweerd@users.noreply.github.com> Co-authored-by: evarisk-kilyan <kilyan.evarisk@gmail.com> Co-authored-by: Vanyo <vanyolai@gmail.com> Co-authored-by: jeremydassaud <49372108+jeremydassaud@users.noreply.github.com> Co-authored-by: f-hoedl <hoefla14@htl-kaindorf.ac.at> Co-authored-by: Vincent Maury <artec.vm@arnac.net> Co-authored-by: vmaury <vmaury@vmaury-Lafite-Pro-16-AMD> Co-authored-by: Vincent Penel <vincent.penel@atm-consulting.fr> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com> Co-authored-by: Joris Le Blansch <jleblansch@gmail.com> Co-authored-by: intelliking <tyleradams93226@gmail.com> Co-authored-by: Benjamin Falière <121813548+BenjaminFlr@users.noreply.github.com> Co-authored-by: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Co-authored-by: Charlène Benke <1179011+defrance@users.noreply.github.com> Co-authored-by: demiton <fabien.cisse@gmail.com> Co-authored-by: Jyhere <jyhere@gmail.com> Co-authored-by: Delthair <41671350+Delthair@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
437 lines
14 KiB
PHP
437 lines
14 KiB
PHP
<?php
|
|
/* Copyright (C) 2013-2016 Olivier Geffroy <jeff@jeffinfo.com>
|
|
* Copyright (C) 2013-2026 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
|
* Copyright (C) 2014-2015 Florian Henry <florian.henry@open-concept.pro>
|
|
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
|
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
|
|
*
|
|
* 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/**
|
|
* \file htdocs/accountancy/admin/categories.php
|
|
* \ingroup Accountancy (Double entries)
|
|
* \brief Page to assign mass categories to accounts
|
|
*/
|
|
|
|
// Load Dolibarr environment
|
|
require '../../main.inc.php';
|
|
|
|
/**
|
|
* @var Conf $conf
|
|
* @var DoliDB $db
|
|
* @var HookManager $hookmanager
|
|
* @var Translate $langs
|
|
* @var User $user
|
|
*/
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
|
|
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
|
|
|
|
$error = 0;
|
|
|
|
// Load translation files required by the page
|
|
$langs->loadLangs(array("accountancy", "admin", "bills", "compta"));
|
|
|
|
$action = GETPOST('action', 'aZ09');
|
|
$confirm = GETPOST('confirm', 'alpha');
|
|
$id = GETPOSTINT('id');
|
|
$catid = GETPOSTINT('catid'); // Alternative parameter name for consistency
|
|
if (empty($id) && !empty($catid)) {
|
|
$id = $catid;
|
|
}
|
|
$account_id = GETPOSTINT('account_id');
|
|
$cpt_id = GETPOSTINT('cpt'); // For compatibility with old system
|
|
|
|
// Security check
|
|
if (!$user->hasRight('accounting', 'chartofaccount')) {
|
|
accessforbidden();
|
|
}
|
|
|
|
// Initialize objects
|
|
$accountingcategory = new AccountancyCategory($db);
|
|
$form = new Form($db);
|
|
$formaccounting = new FormAccounting($db);
|
|
|
|
// Load category
|
|
if ($id > 0) {
|
|
$result = $accountingcategory->fetch($id);
|
|
if ($result < 0) {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
}
|
|
}
|
|
|
|
// Parameters for list (new system only)
|
|
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
|
|
$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')) {
|
|
$page = 0;
|
|
}
|
|
$offset = $limit * $page;
|
|
|
|
// Search filters (new system only)
|
|
$search_account = GETPOST('search_account', 'alpha');
|
|
$search_label = GETPOST('search_label', 'alpha');
|
|
|
|
if (empty($sortfield)) {
|
|
$sortfield = "aa.account_number";
|
|
}
|
|
if (empty($sortorder)) {
|
|
$sortorder = "ASC";
|
|
}
|
|
|
|
// Use new multi report system
|
|
$useNewSystem = (getDolGlobalInt('ACCOUNTING_ENABLE_MULTI_REPORT'));
|
|
|
|
/*
|
|
* Actions
|
|
*/
|
|
|
|
if ($useNewSystem) {
|
|
// Remove filter
|
|
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
|
|
$search_account = '';
|
|
$search_label = '';
|
|
}
|
|
|
|
// Add account to category
|
|
if ($action == 'add_account' && !empty($account_id)) {
|
|
$result = $accountingcategory->addAccountToCategory($account_id);
|
|
|
|
if ($result > 0) {
|
|
setEventMessages($langs->trans("AccountAddedToCategory"), null, 'mesgs');
|
|
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
|
|
exit;
|
|
} elseif ($result == 0) {
|
|
setEventMessages($langs->trans("AccountAlreadyInCategory"), null, 'warnings');
|
|
} else {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
}
|
|
}
|
|
|
|
// Remove account from category
|
|
if ($action == 'confirm_delete' && $confirm == 'yes' && !empty($account_id)) {
|
|
$result = $accountingcategory->deleteAccountFromCategory($account_id);
|
|
|
|
if ($result > 0) {
|
|
setEventMessages($langs->trans("AccountRemovedFromCategory"), null, 'mesgs');
|
|
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
|
|
exit;
|
|
} else {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
}
|
|
}
|
|
|
|
// Add multiple accounts
|
|
if ($action == 'add_multiple' && GETPOST('accounts_to_add', 'array')) {
|
|
$accounts_to_add = GETPOST('accounts_to_add', 'array');
|
|
|
|
$result = $accountingcategory->addMultipleAccountsToCategory($accounts_to_add);
|
|
|
|
if ($result > 0) {
|
|
setEventMessages($langs->trans("XAccountsAdded", $result), null, 'mesgs');
|
|
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
|
|
exit;
|
|
} elseif ($result < 0) {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
} else {
|
|
setEventMessages($langs->trans("NoAccountAdded"), null, 'warnings');
|
|
}
|
|
}
|
|
|
|
// Remove all accounts
|
|
if ($action == 'confirm_remove_all' && $confirm == 'yes') {
|
|
$result = $accountingcategory->removeAllAccountsFromCategory();
|
|
|
|
if ($result >= 0) {
|
|
setEventMessages($langs->trans("XAccountsRemoved", $result), null, 'mesgs');
|
|
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
|
|
exit;
|
|
} else {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
}
|
|
}
|
|
} else {
|
|
// OLD SYSTEM: One-to-many via fk_accounting_category field
|
|
if ($action == 'clean') {
|
|
$result = $accountingcategory->deleteCptCat($cpt_id);
|
|
if ($result >= 0) {
|
|
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
|
|
exit;
|
|
} else {
|
|
setEventMessages($accountingcategory->error, $accountingcategory->errors, 'errors');
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* View
|
|
*/
|
|
|
|
$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration';
|
|
llxHeader('', $langs->trans("AccountingCategory"), $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-admin-categories');
|
|
|
|
if ($useNewSystem) {
|
|
// ============================================================================
|
|
// NEW SYSTEM VIEW
|
|
// ============================================================================
|
|
|
|
// Confirmation dialogs
|
|
if ($action == 'delete') {
|
|
print $form->formconfirm(
|
|
$_SERVER["PHP_SELF"].'?id='.$id.'&account_id='.$account_id,
|
|
$langs->trans('RemoveAccountFromCategory'),
|
|
$langs->trans('ConfirmRemoveAccountFromCategory'),
|
|
'confirm_delete',
|
|
'',
|
|
0,
|
|
1
|
|
);
|
|
}
|
|
|
|
if ($action == 'remove_all') {
|
|
print $form->formconfirm(
|
|
$_SERVER["PHP_SELF"].'?id='.$id,
|
|
$langs->trans('RemoveAllAccountsFromCategory'),
|
|
$langs->trans('ConfirmRemoveAllAccountsFromCategory'),
|
|
'confirm_remove_all',
|
|
'',
|
|
0,
|
|
1
|
|
);
|
|
}
|
|
|
|
// Page title
|
|
$title = $langs->trans("AccountingCategory").': '.$accountingcategory->label;
|
|
print load_fiche_titre($title, '', 'title_accountancy');
|
|
|
|
// Category information card
|
|
print dol_get_fiche_head();
|
|
|
|
print '<table class="border centpercent">';
|
|
print '<tr><td class="titlefield">'.$langs->trans("Code").'</td><td>'.$accountingcategory->code.'</td></tr>';
|
|
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$accountingcategory->label.'</td></tr>';
|
|
if (!empty($accountingcategory->range_account)) {
|
|
print '<tr><td>'.$langs->trans("Comment").'</td><td>'.$accountingcategory->range_account.'</td></tr>';
|
|
}
|
|
print '<tr><td>'.$langs->trans("AccountsLinked").'</td><td><strong>'.$accountingcategory->countAccountsInCategory().'</strong></td></tr>';
|
|
print '</table>';
|
|
|
|
print dol_get_fiche_end();
|
|
|
|
// Build SQL for linked accounts
|
|
$sql = "SELECT aa.rowid, aa.account_number, aa.label";
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."accounting_category_account as aca";
|
|
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = aca.fk_accounting_account";
|
|
$sql .= " WHERE aca.fk_accounting_category = ".((int) $id);
|
|
$sql .= " AND aa.entity = ".$conf->entity;
|
|
|
|
// Search filters
|
|
if (!empty($search_account)) {
|
|
$sql .= natural_search("aa.account_number", $search_account);
|
|
}
|
|
if (!empty($search_label)) {
|
|
$sql .= natural_search("aa.label", $search_label);
|
|
}
|
|
|
|
// Count total
|
|
$nbtotalofrecords = '';
|
|
if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
|
|
$resql = $db->query($sql);
|
|
$nbtotalofrecords = $db->num_rows($resql);
|
|
if (($page * $limit) > $nbtotalofrecords) {
|
|
$page = 0;
|
|
$offset = 0;
|
|
}
|
|
}
|
|
|
|
// Add sort and limit
|
|
$sql .= $db->order($sortfield, $sortorder);
|
|
$sql .= $db->plimit($limit + 1, $offset);
|
|
|
|
$resql = $db->query($sql);
|
|
if (!$resql) {
|
|
dol_print_error($db);
|
|
exit;
|
|
}
|
|
|
|
$num = $db->num_rows($resql);
|
|
|
|
// Parameters
|
|
$param = '&id='.$id;
|
|
if (!empty($search_account)) {
|
|
$param .= '&search_account='.urlencode($search_account);
|
|
}
|
|
if (!empty($search_label)) {
|
|
$param .= '&search_label='.urlencode($search_label);
|
|
}
|
|
|
|
// Form to add accounts
|
|
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
|
print '<input type="hidden" name="token" value="'.newToken().'">';
|
|
print '<input type="hidden" name="action" value="add_multiple">';
|
|
print '<input type="hidden" name="id" value="'.$id.'">';
|
|
|
|
// Get available accounts
|
|
$availableAccounts = $accountingcategory->getAvailableAccountsForCategory();
|
|
|
|
if (count($availableAccounts) > 0) {
|
|
print '<table class="border centpercent">';
|
|
print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AddAccountsToCategory").": ".'</td><td>';
|
|
|
|
// Prepare array for multiselectarray
|
|
$arrayofaccounts = array();
|
|
foreach ($availableAccounts as $account) {
|
|
$arrayofaccounts[$account['id']] = $account['account_number'].' - '.$account['label'];
|
|
}
|
|
|
|
// Use Dolibarr native multiselect with search
|
|
print $form->multiselectarray('accounts_to_add', $arrayofaccounts, array(), 0, 0, '', 0, '100%', '', '', $langs->trans("SelectAccountsToAdd"));
|
|
|
|
print '</td></tr>';
|
|
print '</table>';
|
|
|
|
print '<div class="center">';
|
|
print '<input type="submit" class="button button-save" value="'.$langs->trans("Add").'">';
|
|
print ' ';
|
|
print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
|
|
print '</div>';
|
|
} else {
|
|
print '<div class="info">'.$langs->trans("AllAccountsAlreadyLinked").'</div>';
|
|
}
|
|
|
|
print '</form>';
|
|
|
|
// List of linked accounts
|
|
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
|
print '<input type="hidden" name="token" value="'.newToken().'">';
|
|
print '<input type="hidden" name="id" value="'.$id.'">';
|
|
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
|
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|
|
|
$massactionbutton = '';
|
|
$title = $langs->trans("AccountsLinked");
|
|
|
|
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accountancy', 0, '', '', $limit);
|
|
print '<div class="div-table-responsive">';
|
|
print '<table class="tagtable nobottomiftotal liste">';
|
|
|
|
// Search filters row
|
|
print '<tr class="liste_titre">';
|
|
print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
|
|
print '<td class="liste_titre"><input type="text" class="flat maxwidth200" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
|
|
print '<td class="liste_titre center">';
|
|
$searchpicto = $form->showFilterAndCheckAddButtons(0);
|
|
print $searchpicto;
|
|
print '</td>';
|
|
print '</tr>';
|
|
|
|
// Header row
|
|
print '<tr class="liste_titre">';
|
|
print_liste_field_titre("AccountNumber", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, "", $sortfield, $sortorder);
|
|
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "aa.label", "", $param, "", $sortfield, $sortorder);
|
|
print_liste_field_titre("", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
print '</tr>';
|
|
|
|
// Data rows
|
|
$i = 0;
|
|
while ($i < min($num, $limit)) {
|
|
$obj = $db->fetch_object($resql);
|
|
|
|
print '<tr class="oddeven">';
|
|
|
|
// Account number
|
|
print '<td>';
|
|
print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$obj->rowid.'">';
|
|
print $obj->account_number;
|
|
print '</a>';
|
|
print '</td>';
|
|
|
|
// Label
|
|
print '<td>';
|
|
print dol_escape_htmltag($obj->label);
|
|
print '</td>';
|
|
|
|
// Actions
|
|
print '<td class="center">';
|
|
print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'&account_id='.$obj->rowid.'" class="reposition">';
|
|
print img_delete();
|
|
print '</a>';
|
|
print '</td>';
|
|
|
|
print '</tr>';
|
|
$i++;
|
|
}
|
|
|
|
if ($num == 0) {
|
|
print '<tr><td colspan="3"><span class="opacitymedium">'.$langs->trans("NoAccountLinked").'</span></td></tr>';
|
|
}
|
|
|
|
print '</table>';
|
|
print '</div>';
|
|
print '</form>';
|
|
|
|
// Button to remove all
|
|
if ($num > 0) {
|
|
print '<div class="tabsAction">';
|
|
print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=remove_all&token='.newToken().'&id='.$id.'">'.$langs->trans("RemoveAllAccountsFromCategory").'</a>';
|
|
print '</div>';
|
|
}
|
|
} else {
|
|
// ============================================================================
|
|
// OLD SYSTEM VIEW (compatibility)
|
|
// ============================================================================
|
|
|
|
$listcpt = $accountingcategory->display($id);
|
|
$listcptNotIn = $accountingcategory->getAccountsWithNoCategory($id);
|
|
|
|
print load_fiche_titre($langs->trans('AccountingCategory')." : ".$accountingcategory->label);
|
|
|
|
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
|
|
print '<input type="hidden" name="token" value="'.newToken().'">';
|
|
print '<input type="hidden" name="action" value="clean">';
|
|
|
|
print '<table class="noborder centpercent">';
|
|
print '<tr class="liste_titre">';
|
|
print '<td>'.$langs->trans("AccountNumber").'</td>';
|
|
print '<td>'.$langs->trans("Label").'</td>';
|
|
print '<td></td>';
|
|
print "</tr>\n";
|
|
|
|
if (is_array($listcpt) && count($listcpt) > 0) {
|
|
foreach ($listcpt as $cpt) {
|
|
print '<tr class="oddeven">';
|
|
print '<td>'.length_accountg($cpt->account_number).'</td>';
|
|
print '<td>'.$cpt->label.'</td>';
|
|
print '<td>';
|
|
print '<input type="submit" class="button smallpaddingimp" name="cpt" value="'.$cpt->rowid.'" title="'.$langs->trans("DeleteFromCat").'">';
|
|
print img_picto($langs->trans("DeleteFromCat"), 'unlink', 'class="paddingleft"');
|
|
print "</td>";
|
|
print "</tr>\n";
|
|
}
|
|
} else {
|
|
print '<tr><td colspan="3"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
|
}
|
|
|
|
print '</table>';
|
|
print '</form>';
|
|
}
|
|
|
|
// End of page
|
|
llxFooter();
|
|
$db->close();
|