From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 7 Apr 2016 16:17:36 +0000 (+0000)
Subject: #wesco : allow kadreo to upload xlsx files
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9f0f5f4b31b1a83d7fa750f829a24ee58f8a8bff;p=cubeextranet.git

#wesco : allow kadreo to upload xlsx files
#fluidbook-prod allow http -> https communication for ws
---

diff --git a/crossdomain.xml b/crossdomain.xml
index 9bc07b9ae..ede9ad348 100644
--- a/crossdomain.xml
+++ b/crossdomain.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd"><cross-domain-policy><allow-access-from domain="*" /></cross-domain-policy>
\ No newline at end of file
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+    <allow-access-from domain="*" secure="false"/>
+</cross-domain-policy>
\ No newline at end of file
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 6caa26892..a39bfe920 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -279,7 +279,7 @@ class wsBookParametres extends wsParametres {
 		                                                        'Essilor Recap' => 'com.fluidbook.player.basket.custom.essilorrecap.EssilorRecapBasketManager',
 		                                                        'Wesco Ventes' => 'com.fluidbook.player.basket.custom.wesco.WescoBasketManager'), 'grade' => 5);
 		$this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
-		                                          'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
+		                                          'label' => __('Références produits'), 'grade' =>3, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
 		$this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 		                                      'label' => __('Images des produits'), 'grade' => 5, 'fileFilter' => $imageFilter, 'hint' => __('Chaque image doit avoir pour nom exact la référence du produit'),
 		                                      'multiple' => true, 'dir' => 'commerce');