';
print '';
diff --git a/htdocs/hrm/lib/hrm.lib.php b/htdocs/hrm/lib/hrm.lib.php
index 88a851f0137..3dd00c38b62 100644
--- a/htdocs/hrm/lib/hrm.lib.php
+++ b/htdocs/hrm/lib/hrm.lib.php
@@ -5,6 +5,7 @@
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
* Copyright (C) 2022 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
@@ -29,7 +30,7 @@
/**
* Prepare admin pages header
*
- * @return array
+ * @return array Array of tabs to show
*/
function hrmAdminPrepareHead()
{
diff --git a/htdocs/hrm/lib/hrm_job.lib.php b/htdocs/hrm/lib/hrm_job.lib.php
index adeb2637445..69df852cadf 100644
--- a/htdocs/hrm/lib/hrm_job.lib.php
+++ b/htdocs/hrm/lib/hrm_job.lib.php
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Greg Rastklan
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
+ * 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
@@ -28,7 +29,7 @@
* Prepare array of tabs for Job
*
* @param Job $object Job
- * @return array Array of tabs
+ * @return array Array of tabs to show
*/
function jobPrepareHead($object)
{
diff --git a/htdocs/hrm/lib/hrm_position.lib.php b/htdocs/hrm/lib/hrm_position.lib.php
index 2cb05a9593b..c21c042bbc6 100644
--- a/htdocs/hrm/lib/hrm_position.lib.php
+++ b/htdocs/hrm/lib/hrm_position.lib.php
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Greg Rastklan
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
+ * 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
@@ -29,7 +30,7 @@
* Prepare array of tabs for positions
*
* @param Position $object Position
- * @return array Array of tabs
+ * @return array Array of tabs to show
*/
function positionCardPrepareHead($object)
{
diff --git a/htdocs/hrm/lib/hrm_skill.lib.php b/htdocs/hrm/lib/hrm_skill.lib.php
index c3b7b892c79..9c5a61c158c 100644
--- a/htdocs/hrm/lib/hrm_skill.lib.php
+++ b/htdocs/hrm/lib/hrm_skill.lib.php
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Greg Rastklan
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
+ * 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
@@ -28,7 +29,7 @@
* Prepare array of tabs for Skill
*
* @param Skill $object Skill
- * @return array Array of tabs
+ * @return array Array of tabs to show
*/
function skillPrepareHead($object)
{
diff --git a/htdocs/hrm/lib/hrm_skilldet.lib.php b/htdocs/hrm/lib/hrm_skilldet.lib.php
index 1ba52808f28..679fae5ffb0 100644
--- a/htdocs/hrm/lib/hrm_skilldet.lib.php
+++ b/htdocs/hrm/lib/hrm_skilldet.lib.php
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Greg Rastklan
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
+ * 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
@@ -28,7 +29,7 @@
* Prepare array of tabs for Skilldet
*
* @param Skilldet $object Skilldet
- * @return array Array of tabs
+ * @return array Array of tabs to show
*/
function skilldetPrepareHead($object)
{
diff --git a/htdocs/hrm/lib/hrm_skillrank.lib.php b/htdocs/hrm/lib/hrm_skillrank.lib.php
index 1d0083ea37f..6ab9e994f5e 100644
--- a/htdocs/hrm/lib/hrm_skillrank.lib.php
+++ b/htdocs/hrm/lib/hrm_skillrank.lib.php
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Greg Rastklan
* Copyright (C) 2021 Jean-Pascal BOUDET
* Copyright (C) 2021 Grégory BLEMAND
+ * 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
@@ -28,7 +29,7 @@
* Prepare array of tabs for SkillRank
*
* @param SkillRank $object SkillRank
- * @return array Array of tabs
+ * @return array Array of tabs to show
*/
function skillrankPrepareHead($object)
{
@@ -115,7 +116,7 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
$skilldet = new Skilldet($db);
$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, '(fk_skill:=:'.((int) $fk_skill).')');
- if (!is_array($Lines) && $Lines<0) {
+ if (!is_array($Lines) && $Lines < 0) {
setEventMessages($skilldet->error, $skilldet->errors, 'errors');
}
if (empty($Lines)) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index ef9bdf9a17c..a6e52a77659 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -355,7 +355,7 @@ if ($step == 1 || !$datatoimport) {
//var_dump($key.' '.$value['position_of_profile'].' '.$value['import_code'].' '.$objimport->array_import_module[$key]['module']->getName().' '.$objimport->array_import_code[$key]);
print '| ';
$titleofmodule = $objimport->array_import_module[$key]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
@@ -414,7 +414,7 @@ if ($step == 2 && $datatoimport) {
print ' | | '.$langs->trans("Module").' | ';
print '';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
@@ -531,7 +531,7 @@ if ($step == 3 && $datatoimport) {
print ' | | '.$langs->trans("Module").' | ';
print '';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
@@ -936,7 +936,7 @@ if ($step == 4 && $datatoimport) {
print ' | | '.$langs->trans("Module").' | ';
print '';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
@@ -1606,7 +1606,7 @@ if ($step == 5 && $datatoimport) {
print ' | | '.$langs->trans("Module").' | ';
print '';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
@@ -2095,7 +2095,7 @@ if ($step == 6 && $datatoimport) {
print ' | | '.$langs->trans("Module").' | ';
print '';
$titleofmodule = $objimport->array_import_module[0]['module']->getName();
- // Special cas for import common to module/services
+ // Special case for import common to module/services
if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
$titleofmodule = $langs->trans("ProductOrService");
}
diff --git a/htdocs/install/mysql/data/llx_accounting_category-accounting.sql b/htdocs/install/mysql/data/llx_accounting_category-accounting.sql
new file mode 100644
index 00000000000..e1c19d2031e
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_accounting_category-accounting.sql
@@ -0,0 +1,26 @@
+-- Copyright (C) 2016-2024 Alexandre Spangaro
+-- Copyright (C) 2017 Laurent Destailleur
+--
+-- 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 .
+--
+--
+
+-- Insert first personalized report. This is a minimal default setup.
+INSERT INTO llx_c_accounting_report (code, label, fk_country, active) VALUES ('REP', 'Report personalized', 0, 1);
+
+-- Group of accounting accounts for report. This is a minimal default setup.
+INSERT INTO llx_c_accounting_category (rowid, fk_report, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 1, 1, 'INCOMES', 'Income of products/services', 'Example: 7xxxxx', 0, 0, '', '10', 0, 1);
+INSERT INTO llx_c_accounting_category (rowid, fk_report, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 2, 1, 'EXPENSES', 'Expenses of products/services', 'Example: 6xxxxx', 0, 0, '', '20', 0, 1);
+INSERT INTO llx_c_accounting_category (rowid, fk_report, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 3, 1, 'PROFIT', 'Balance', '', 0, 1, 'INCOMES+EXPENSES', '30', 0, 1);
+
diff --git a/htdocs/install/mysql/data/llx_accounting_category.sql b/htdocs/install/mysql/data/llx_accounting_category.sql
deleted file mode 100644
index 6621dc32f52..00000000000
--- a/htdocs/install/mysql/data/llx_accounting_category.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- Copyright (C) 2016 Alexandre Spangaro
--- Copyright (C) 2017 Laurent Destailleur
---
--- 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 .
---
---
-
-
--- Group of accounting accounts for report. This is a minimal default setup.
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 1, 'INCOMES', 'Income of products/services', 'Example: 7xxxxx', 0, 0, '', '10', 0, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 2, 'EXPENSES', 'Expenses of products/services', 'Example: 6xxxxx', 0, 0, '', '20', 0, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES ( 3, 'PROFIT', 'Balance', '', 0, 1, 'INCOMES+EXPENSES', '30', 0, 1);
-
diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
index 48029144088..393d29b2674 100644
--- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
+++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
@@ -134,28 +134,6 @@ ALTER TABLE llx_socpeople ADD COLUMN ip varchar(250);
ALTER TABLE llx_webhook_target ADD COLUMN trigger_stack text;
--- Product attribut extrafields
-CREATE TABLE llx_product_attribute_extrafields
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- fk_object integer NOT NULL,
- import_key varchar(14) -- import key
-) ENGINE=innodb;
-
-ALTER TABLE llx_product_attribute_extrafields ADD INDEX idx_product_attribute_extrafields (fk_object);
-
--- Product attribut value extrafields
-CREATE TABLE llx_product_attribute_value_extrafields
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- fk_object integer NOT NULL,
- import_key varchar(14) -- import key
-) ENGINE=innodb;
-
-ALTER TABLE llx_product_attribute_value_extrafields ADD INDEX idx_product_attribute_value_extrafields (fk_object);
-
ALTER TABLE llx_recruitment_recruitmentcandidature MODIFY fk_user_creat integer NULL;
ALTER TABLE llx_ecm_files ADD COLUMN agenda_id integer;
@@ -239,3 +217,38 @@ INNER JOIN llx_categorie AS c
AND c.type = 8
SET bl.fk_categ = c.rowid
WHERE c.rowid IS NOT NULL;
+
+-- Accounting - Add personalized multi-report
+create table llx_c_accounting_report
+(
+ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ entity integer NOT NULL DEFAULT 1,
+ code varchar(16) NOT NULL,
+ label varchar(255) NOT NULL,
+ fk_country integer DEFAULT NULL,
+ active integer DEFAULT 1
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_accounting_report ADD UNIQUE INDEX uk_c_accounting_report (code,entity);
+
+INSERT INTO llx_c_accounting_report (code, label, active) VALUES ('REP', 'Report personalized', 1);
+
+ALTER TABLE llx_c_accounting_category ADD COLUMN fk_report integer NOT NULL DEFAULT 1 AFTER entity;
+
+ALTER TABLE llx_c_accounting_category DROP INDEX uk_c_accounting_category;
+ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category (code,entity,fk_report);
+
+create table llx_accounting_category_account
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ fk_accounting_category integer,
+ fk_accounting_account bigint
+) ENGINE=innodb;
+
+ALTER TABLE llx_accounting_category_account ADD INDEX idx_accounting_category_account_fk_accounting_category (fk_accounting_category);
+ALTER TABLE llx_accounting_category_account ADD CONSTRAINT fk_accounting_category_account_fk_accounting_category FOREIGN KEY (fk_accounting_category) REFERENCES llx_c_accounting_category (rowid);
+
+ALTER TABLE llx_accounting_category_account ADD INDEX idx_accounting_category_account_fk_accounting_account (fk_accounting_account);
+ALTER TABLE llx_accounting_category_account ADD CONSTRAINT fk_accounting_category_account_fk_accounting_account FOREIGN KEY (fk_accounting_account) REFERENCES llx_accounting_account (rowid);
+
+ALTER TABLE llx_accounting_category_account ADD UNIQUE INDEX uk_accounting_category_account(fk_accounting_category, fk_accounting_account);
diff --git a/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.key.sql b/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.key.sql
new file mode 100644
index 00000000000..7c4a543ebc0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.key.sql
@@ -0,0 +1,26 @@
+-- ===================================================================
+-- 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
+-- 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 .
+--
+-- Table for connect accounting category with accounting account
+-- ===================================================================
+
+ALTER TABLE llx_accounting_category_account ADD INDEX idx_accounting_category_account_fk_accounting_category (fk_accounting_category);
+ALTER TABLE llx_accounting_category_account ADD CONSTRAINT fk_accounting_category_account_fk_accounting_category FOREIGN KEY (fk_accounting_category) REFERENCES llx_c_accounting_category (rowid);
+
+ALTER TABLE llx_accounting_category_account ADD INDEX idx_accounting_category_account_fk_accounting_account (fk_accounting_account);
+ALTER TABLE llx_accounting_category_account ADD CONSTRAINT fk_accounting_category_account_fk_accounting_account FOREIGN KEY (fk_accounting_account) REFERENCES llx_accounting_account (rowid);
+
+ALTER TABLE llx_accounting_category_account ADD UNIQUE INDEX uk_accounting_category_account (fk_accounting_category, fk_accounting_account);
diff --git a/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.sql b/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.sql
new file mode 100644
index 00000000000..876381fd431
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_category_account-accounting.sql
@@ -0,0 +1,25 @@
+-- ===================================================================
+-- 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
+-- 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 .
+--
+-- Table for connect accounting category with accounting account
+-- ===================================================================
+
+CREATE TABLE llx_accounting_category_account
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ fk_accounting_category integer,
+ fk_accounting_account bigint
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql b/htdocs/install/mysql/tables/llx_c_accounting_category-accounting.key.sql
similarity index 88%
rename from htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
rename to htdocs/install/mysql/tables/llx_c_accounting_category-accounting.key.sql
index 5042fbae6ae..436f44718a7 100644
--- a/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_accounting_category-accounting.key.sql
@@ -1,5 +1,5 @@
-- ===================================================================
--- Copyright (C) 2015-2016 Alexandre Spangaro
+-- Copyright (C) 2015-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
@@ -17,5 +17,4 @@
-- Table with category for accounting account
-- ===================================================================
-ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code,entity);
-
+ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category (code,entity,fk_report);
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.sql b/htdocs/install/mysql/tables/llx_c_accounting_category-accounting.sql
similarity index 83%
rename from htdocs/install/mysql/tables/llx_c_accounting_category.sql
rename to htdocs/install/mysql/tables/llx_c_accounting_category-accounting.sql
index 697bd2a99f1..58e0f2de93d 100644
--- a/htdocs/install/mysql/tables/llx_c_accounting_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_accounting_category-accounting.sql
@@ -1,6 +1,6 @@
-- ===================================================================
--- Copyright (C) 2015-2016 Alexandre Spangaro
--- Copyright (C) 2016 Jamal Elbaz
+-- Copyright (C) 2015-2024 Alexandre Spangaro
+-- Copyright (C) 2016 Jamal Elbaz | |