#wesco : xls parse adjusments

@1

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 9d9b74a5f650e9034c0fae6f2e4a7247400b3242..475714e3f1b2eda208d484024757fb97aedc02ae 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1385,12 +1385,18 @@ class wsDAOBook extends commonDAO {
                                                $i++;
                                        }
                                } elseif ($ext == 'xlsx') {
-                                       include_once ROOT.'/inc/ZendFramework/PHPExcel/PHPExcel.php';
+                                       include_once ROOT . '/inc/ZendFramework/PHPExcel/PHPExcel.php';
                                        $objReader = PHPExcel_IOFactory::createReader('Excel2007');
                                        $objPHPExcel = $objReader->load($referencesFile);
 
+
                                        foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {
-                                               $worksheets[$worksheet->getTitle()] = $worksheet->toArray();
+                                               $title = $worksheet->getTitle();
+                                               if (strlen($title) == 2 && cubeCountry::getCountry($title)) {
+                                                       $title = cubeCountry::getCountry($title);
+                                               }
+
+                                               $worksheets[$title] = $worksheet->toArray(null, true, true);
                                        }
                                        $flex->addVariable('basketReferences', $worksheets, false, true, "OrderedObject");
                                }