Merge branch 'dev'

backend/views/distribution/index.php

@@ -261,6 +261,8 @@ $this->setPageTitle('Distributions') ;
                                         <span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non réglé</span>
                                         <span class="label label-default input-group-addon" v-else-if="order.amount_paid > order.amount">surplus</span>
                                         <span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à payer</span>
+                                        
+                                        <span class="glyphicon glyphicon-time" title="Paiement automatique" v-if="order.auto_payment && producer.credit && (order.amount_paid == 0 || order.amount_paid < order.amount)"></span>
                                     </div>
                                 </td>
                                 <td class="column-payment" v-if="producer.credit">

common/models/PointSale.php

@@ -341,7 +341,9 @@ class PointSale extends ActiveRecordCommon
      */
     public function getCreditFunctioning() 
     {
-        return $this->credit_functioning ? $this->credit_functioning : Producer::getConfig('credit_functioning') ;
+        return strlen($this->credit_functioning) > 0 ? 
+            $this->credit_functioning : 
+            Producer::getConfig('credit_functioning') ;
     }
     
     /**