diff --git a/Jenkinsfile b/Jenkinsfile
index c238e452c..0d56f7476 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -99,7 +99,6 @@ pipeline {
                 sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
                 sh 'docker-compose build --parallel'
                 sh 'docker-compose push'
-                sh 'docker logout $REGISTRY'
             }
         }
         stage('Deploy') {
@@ -108,7 +107,7 @@ pipeline {
                 branch 'master'
             }}
             steps {
-                sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
+                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }
         }
         stage('Database') {
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index 5840ecdf1..3778c62b9 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -14,8 +14,25 @@ vn-chip {
 
     &.colored {
         background-color: $color-main;
-        color: $color-font-dark;
+        color: $color-font-bg;
     }
+    &.notice {
+        background-color: $color-notice-medium
+    }
+    &.success {
+        background-color: $color-success-medium;
+    }
+    &.warning {
+        background-color: $color-main-medium;
+    }
+    &.alert {
+        background-color: $color-alert-medium;
+    }
+    &.message {
+        color: $color-font-dark;
+        background-color: $color-bg-dark
+    }
+
     & > div {
         display: flex;
         align-items: center;
diff --git a/front/nginx.conf b/front/nginx.conf
index 64f9436f3..22bce2283 100644
--- a/front/nginx.conf
+++ b/front/nginx.conf
@@ -7,11 +7,7 @@ server {
 	client_max_body_size 250M;
 
 	root /salix/dist;
-	error_page 404 = @notfound;
 
-	location @notfound {
-		return 302 /;
-	}
 	location / {
 		autoindex on;
 	}
diff --git a/modules/agency/front/location/style.scss b/modules/agency/front/location/style.scss
index 4972a5d29..2316a2622 100644
--- a/modules/agency/front/location/style.scss
+++ b/modules/agency/front/location/style.scss
@@ -1,14 +1,19 @@
 @import "variables";
 
 vn-treeview-child {
-    .content > .vn-check:not(.indeterminate) {
-        color: $color-button;
+    .content > .vn-check:not(.indeterminate):not(.checked) {
+        color: $color-alert;
 
         & > .btn {
-            border-color: $color-button;
+            border-color: $color-alert;
         }
     }
     .content > .vn-check.checked {
-        color: $color-button;
+        color: $color-notice;
+
+        & > .btn {
+            background-color: $color-notice;
+            border-color: $color-notice
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index a7046e17b..28ba9989b 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -43,27 +43,27 @@
                                 disabled="true">
                             </vn-check>
                         </vn-td>
-                        <vn-td>{{entry.warehouse| dashIfEmpty}}</vn-td>
-                        <vn-td>{{entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
-                        <vn-td number>{{entry.entryFk | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.price2 | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.price3 | dashIfEmpty}}</vn-td>
+                        <vn-td>{{::entry.warehouse| dashIfEmpty}}</vn-td>
+                        <vn-td>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <vn-td number>{{::entry.entryFk | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
-                            <span class="chip" ng-class="{counter: entry.groupingMode == 2}">
-                                {{entry.packing | dashIfEmpty}}
-                            </span>
+                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> 
+                                <span translate>{{::entry.packing | dashIfEmpty}}</span>
+                            </vn-chip>
                         </vn-td>
                         <vn-td number>
-                            <span class="chip" ng-class="{counter: entry.groupingMode == 1}">
-                                {{entry.grouping | dashIfEmpty}}
-                            </span>
+                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> 
+                                <span translate>{{::entry.grouping | dashIfEmpty}}</span>
+                            </vn-chip>
                         </vn-td>
-                        <vn-td number class="expendable">{{entry.stems | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.quantity}}</vn-td>
-                        <vn-td number class="expendable">{{entry.buyingValue | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.packageFk | dashIfEmpty}}</vn-td>
-                        <vn-td class="expendable">{{entry.supplier | dashIfEmpty}}</vn-td>
+                        <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.quantity}}</vn-td>
+                        <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
+                        <vn-td class="expendable">{{::entry.supplier | dashIfEmpty}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index 812ef0715..1bad225de 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -96,16 +96,22 @@
                                             </tr>
                                             <tr class="description">
                                                 <td colspan="2" class="centered">
-                                                    <strong class="font gray" v-if="sale.val1">{{sale.tag1}}</strong> 
-                                                    <span>{{sale.val1}}</span>
+                                                    <div v-if="sale.value5">
+                                                        <strong class="font gray">{{sale.tag5}}</strong> 
+                                                        <span>{{sale.value5}}</span>
+                                                    </div>
                                                 </td>
                                                 <td colspan="3" class="centered">
-                                                    <strong class="font gray" v-if="sale.val2">{{sale.tag2}}</strong> 
-                                                    <span>{{sale.val2}}</span>
+                                                    <div v-if="sale.value6">
+                                                        <strong class="font gray">{{sale.tag6}}</strong> 
+                                                        <span>{{sale.value6}}</span>
+                                                    </div>
                                                 </td>
                                                 <td colspan="2" class="centered">
-                                                    <strong class="font gray" v-if="sale.val3">{{sale.tag3}}</strong>
-                                                    <span>{{sale.val3}}</span>
+                                                    <div v-if="sale.value7">
+                                                        <strong class="font gray">{{sale.tag7}}</strong> 
+                                                        <span>{{sale.value7}}</span>
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr class="description phytosanitary" v-if="sale.passportNumber">
diff --git a/print/templates/reports/sepa-core/locale/fr.yml b/print/templates/reports/sepa-core/locale/fr.yml
index ec6fd11ab..9489fa277 100644
--- a/print/templates/reports/sepa-core/locale/fr.yml
+++ b/print/templates/reports/sepa-core/locale/fr.yml
@@ -1,4 +1,4 @@
-title: Mandat de domiciliation Européene LCR
+title: Mandat de domiciliation Européene
 description: En signant ce formulaire de mandat, vous autorisez VERDNATURA LEVANTE SL 
   à envoyer des instructions à votre banque pour débiter votre compte, et (B) votre banque 
   à débiter votre compte conformément aux instructions de VERDNATURA LEVANTE SL.