Merge branch 'master' into dev

producer/web/css/screen.css

@@ -1308,7 +1308,7 @@ termes.
   display: block;
 }
 /* line 14, ../sass/order/_order.scss */
-.order-order #main #app-order-order #distribution-date {
+.order-order #main #app-order-order #distribution-date, .order-order #main #app-order-order #order-distribution-date {
   display: none;
 }
 /* line 18, ../sass/order/_order.scss */

producer/web/js/vuejs/order-order.js

@@ -67,7 +67,9 @@ var app = new Vue({
     },
     mounted: function() {
 
-        if($('#order-distribution-date').size() || $('#distribution-date').size()) {
+        var dateDefined = $('#order-distribution-date').size() || $('#distribution-date').size() ;
+
+        if(dateDefined) {
             if($('#order-distribution-date').size()) {
                 this.date = new Date($('#order-distribution-date').html()) ;
             }
@@ -78,13 +80,16 @@ var app = new Vue({
             this.dateFormat = ('0' + this.date.getDate()).slice(-2)+ '/'
             + ('0' + (this.date.getMonth() +1)).slice(-2) + '/'
             + this.date.getFullYear() ;
+        }
+        
+        this.init('first') ;
 
+        if(dateDefined) {
             if(this.producer && this.producer.option_order_entry_point == 'date') {
                 this.changeStep('point-sale') ;
             }
         }
-        
-        this.init('first') ;
+
         this.loadingInit = false ;
     },
     methods: {

producer/web/sass/order/_order.scss

@@ -11,7 +11,7 @@
             display: block ;
         }
         
-        #distribution-date {
+        #distribution-date, #order-distribution-date {
             display: none ;
         }