From f4181a77cdc792d38e8f9f4d65a45028304b2d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 24 Oct 2020 13:53:00 +0200 Subject: [PATCH 1/2] Update chargesociales.class.php --- htdocs/compta/sociales/class/chargesociales.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 81ae1e28f20..b0aed118226 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2007 Laurent Destailleur - * Copyright (C) 2016-2019 Frédéric France + * Copyright (C) 2016-2020 Frédéric France * Copyright (C) 2017 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -399,7 +399,7 @@ class ChargeSociales extends CommonObject $sql .= " AND paye = 0"; if ($year) { - $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' "; + $sql .= " AND f.datev >= '".(int) $year."-01-01' AND f.datev <= '".(int) $year."-12-31' "; } $result = $this->db->query($sql); From a7b23dc4f623a624d6d3004540cf88d566729fb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2020 14:14:50 +0100 Subject: [PATCH 2/2] Update chargesociales.class.php --- htdocs/compta/sociales/class/chargesociales.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index b0aed118226..11b225d0896 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -399,7 +399,7 @@ class ChargeSociales extends CommonObject $sql .= " AND paye = 0"; if ($year) { - $sql .= " AND f.datev >= '".(int) $year."-01-01' AND f.datev <= '".(int) $year."-12-31' "; + $sql .= " AND f.datev >= '".((int) $year)."-01-01' AND f.datev <= '".((int) $year)."-12-31' "; } $result = $this->db->query($sql);