root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-facturation-date-group-facture' into staging

Browse Source
This commit is contained in:
Tiavina 2025-03-02 16:44:46 +03:00
commit 560e097035
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gestion/lib/Db/Bdd.php
View File

@ -4106,17 +4106,15 @@ class Bdd {
$month = $month ?? $datetimeNow->format('m'); $month = $month ?? $datetimeNow->format('m');
$year = $year ?? $datetimeNow->format('Y'); $year = $year ?? $datetimeNow->format('Y');
if($facturationDate == null || $facturationDate == ""){ if($facturationDate == null || $facturationDate == ""){
$facturationDate = DateHelpers::GetLastDayOfTheMonthOfADate($datetimeNow); $facturationDatetime = DateHelpers::GetLastDayOfTheMonthOfADate($datetimeNow);
$facturationDate = $facturationDate->format('Y-m-d');
} }
else{ else{
$facturationDate = Datetime::createFromFormat('Y-m-d',$facturationDate); $facturationDatetime = Datetime::createFromFormat('Y-m-d',$facturationDate);
$facturationDate = $facturationDate->format('Y-m-d');
} }
$facturationDate = $facturationDatetime->format('Y-m-d');
$factureDate = $datetimeNow->format('Y-m-d'); $factureDate = $facturationDate;
$factureNumber = $this->getFactureNumberByDate($datetimeNow); $factureNumber = $this->getFactureNumberByDate($facturationDatetime);
$fullFactureNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($datetimeNow,$factureNumber,"FAC"); $fullFactureNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($facturationDatetime,$factureNumber,"FAC");
$last = 0; $last = 0;
$last = $this->lastNumFacture(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD); $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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?);"; $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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?);";