From 80199faf1acffa0c92e9b0bb8d01e5362bcce700 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 20 Feb 2023 11:27:14 +0100
Subject: [PATCH] FIX filter sql accounting account

---
 .../accountancy/class/accountancycategory.class.php   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 7ae48c749c2..4d825d721c9 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -861,20 +861,29 @@ class AccountancyCategory // extends CommonObject
 			exit();
 		}
 
+		$pcgverid = $conf->global->CHARTOFACCOUNTS;
+		$pcgvercode = dol_getIdFromCode($this->db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
+		if(empty($pcgvercode)) {
+			$pcgvercode = $pcgverid;
+		}
+
 		if (!empty($cat_id)) {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE t.fk_accounting_category = ".((int) $cat_id);
 			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " AND t.active = 1";
+			$sql .= " AND t.fk_pcg_version = '".$pcgvercode."'";
 			$sql .= " ORDER BY t.account_number";
 		} else {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
 			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= ' AND t.active = 1';
+			$sql .= " AND t.fk_pcg_version = '".$pcgvercode."'";
 			$sql .= " ORDER BY t.account_number";
 		}
-		//echo $sql;
 
 		$resql = $this->db->query($sql);
 		if ($resql) {