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

Merge branch 'hotfixes/hotfix-fec-facture-num' into releases/release-hytha-prod

Browse Source
This commit is contained in:
Tiavina 2025-02-19 20:56:50 +03:00
commit 9676985c5f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -9,5 +9,13 @@ pipeline {
sudo su jenkins -c "git stash && git pull origin staging" ''' sudo su jenkins -c "git stash && git pull origin staging" '''
} }
} }
stage ("deploy to DRL dev ezway") {
when { branch 'releases/release-hytha' }
agent { label 'apache && dev' }
steps {
sh '''cd /var/www/drl-nextcloud/custom_apps
sudo su jenkins -c "git stash && git pull origin releases/release-hytha" '''
}
}
} }
} }

2
gestion/lib/Controller/PageController.php
View File

@ -1701,7 +1701,7 @@ class PageController extends Controller {
$factures = json_decode($this->myDb->getFactures($this->idNextcloud)); $factures = json_decode($this->myDb->getFactures($this->idNextcloud));
foreach ($factures as $key => $facture) { foreach ($factures as $key => $facture) {
$facture_temp = array( $facture_temp = array(
'num' => explode('/',$facture->num)[2], 'num' => $facture->num,
'client' => $facture->entreprise, 'client' => $facture->entreprise,
'nom_client' => $facture->nom, 'nom_client' => $facture->nom,
'date' => $facture->date, 'date' => $facture->date,