wait #7378 @0:10

diff --git a/framework/application/controllers/AdminajaxpopupController.php b/framework/application/controllers/AdminajaxpopupController.php
index 40dc861603838397d8069cf180af79f491421a81..ccda8e631a0feffaa0bdcc9a0fccab2b3d6615bb 100644 (file)
--- a/framework/application/controllers/AdminajaxpopupController.php
+++ b/framework/application/controllers/AdminajaxpopupController.php
@@ -76,7 +76,6 @@ class AdminajaxpopupController extends CubeIT_Controller_Admin_AdminajaxpopupCon
 <option value="ESPECES">Espèces</option>
 <option value="CHEQUE">Chèque</option>
 <option value="VIREMENT">Virement</option>
-<option value="SOGENACTIF">Sogenactif</option>
 </select>';
         $res .= '</dd>';
         $res .= '</div>';

diff --git a/framework/application/forms/Devis.php b/framework/application/forms/Devis.php
index b7cc604e737486b12f4401bc8ed21b8ca4baf0ef..d79f02c50f3374f5b128e6cb3198e98d2421e0b9 100644 (file)
--- a/framework/application/forms/Devis.php
+++ b/framework/application/forms/Devis.php
@@ -163,7 +163,7 @@ class DTLC_Form_Devis extends CubeIT_Form_List
         if ($r['status'] != 1) {
             return;
         }
-        return $view->linkPopup($view->imageSilk('cart'), '/admin/ajaxpopup/devisConvertToStoreOrder/' . $r['id'], array('title' => 'Convertir en facture magasin'));
+        return $view->linkPopup($view->image('/images/favicon/favicon.png', '', 16, 16), '/admin/ajaxpopup/devisConvertToStoreOrder/' . $r['id'], array('title' => 'Convertir en facture magasin'));
     }
 
     protected function _actionDone($r, $view)
@@ -369,7 +369,7 @@ class DTLC_Form_Devis extends CubeIT_Form_List
         $this->addElement($reference);
 
         $legend = $this->getAdmin() ? 'Coordonnées' : 'Vos coordonnées';
-        $this->addDisplayGroup(array('societe', 'prenom', 'nom', 'telephone','fax', 'mobile', 'email', 'reference', 'adresse', 'code_postal', 'ville', 'pays', 'tva_intra'), 'coordonnees', array('legend' => $legend));
+        $this->addDisplayGroup(array('societe', 'prenom', 'nom', 'telephone', 'fax', 'mobile', 'email', 'reference', 'adresse', 'code_postal', 'ville', 'pays', 'tva_intra'), 'coordonnees', array('legend' => $legend));
     }
 
     protected function _setDemandes()