Merge branch 'hotfixes/hotfix-fec-facture-num' into releases/release-hytha-prod
This commit is contained in:
commit
9676985c5f
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
@ -9,5 +9,13 @@ pipeline {
|
||||
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" '''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1701,7 +1701,7 @@ class PageController extends Controller {
|
||||
$factures = json_decode($this->myDb->getFactures($this->idNextcloud));
|
||||
foreach ($factures as $key => $facture) {
|
||||
$facture_temp = array(
|
||||
'num' => explode('/',$facture->num)[2],
|
||||
'num' => $facture->num,
|
||||
'client' => $facture->entreprise,
|
||||
'nom_client' => $facture->nom,
|
||||
'date' => $facture->date,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user