From dc8e6e12aa4a0165cbcb76eaee845649a3539bc7 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Sun, 2 Mar 2025 16:43:59 +0300 Subject: [PATCH] chronos on facture group --- gestion/lib/Db/Bdd.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index d84aa17..2f2087e 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -4106,22 +4106,20 @@ class Bdd { $month = $month ?? $datetimeNow->format('m'); $year = $year ?? $datetimeNow->format('Y'); if($facturationDate == null || $facturationDate == ""){ - $facturationDate = DateHelpers::GetLastDayOfTheMonthOfADate($datetimeNow); - $facturationDate = $facturationDate->format('Y-m-d'); + $facturationDatetime = DateHelpers::GetLastDayOfTheMonthOfADate($datetimeNow); } else{ - $facturationDate = Datetime::createFromFormat('Y-m-d',$facturationDate); - $facturationDate = $facturationDate->format('Y-m-d'); + $facturationDatetime = Datetime::createFromFormat('Y-m-d',$facturationDate); } - - $factureDate = $datetimeNow->format('Y-m-d'); - $factureNumber = $this->getFactureNumberByDate($datetimeNow); - $fullFactureNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($datetimeNow,$factureNumber,"FAC"); + $facturationDate = $facturationDatetime->format('Y-m-d'); + $factureDate = $facturationDate; + $factureNumber = $this->getFactureNumberByDate($facturationDatetime); + $fullFactureNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($facturationDatetime,$factureNumber,"FAC"); $last = 0; $last = $this->lastNumFacture(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD); $sql = "INSERT INTO `".$this->tableprefix."facture` (`date`,`id_nextcloud`,`num`,`date_paiement`,`type_paiement`,`id_devis`,`user_id`, `version`,`facture_number`,`facture_type`,`month`,`year`,`fk_client_id`,`fk_client_group_facturation_id`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?);"; $this->execSQLNoData($sql, array( - $factureDate , + $factureDate, BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD, $fullFactureNumber, $facturationDate,