[Fmsystem-commits] [15454] property: alter import rules

[sigurdne]

Revision: 15454
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15454
Author:   sigurdne
Date:     2016-08-12 14:54:46 +0000 (Fri, 12 Aug 2016)
Log Message:
-----------
property: alter import rules

Modified Paths:
--------------
    trunk/property/inc/class.bowo_hour.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php

Modified: trunk/property/inc/class.bowo_hour.inc.php
===================================================================
--- trunk/property/inc/class.bowo_hour.inc.php  2016-08-12 14:53:32 UTC (rev 
15453)
+++ trunk/property/inc/class.bowo_hour.inc.php  2016-08-12 14:54:46 UTC (rev 
15454)
@@ -417,7 +417,7 @@
                                $section_name = $valueset['name'];
                                foreach ($valueset['data'] as $entry)
                                {
-                                       if ((int)$entry[5] > 0)
+                                       if ((int)$entry[4] > 0)
                                        {
                                                $descr = $entry[1];
 
@@ -432,8 +432,8 @@
                                                        'descr' => $descr,
                                                        'unit' => $entry[2],
                                                        'cost' => $entry[6],
-                                                       'quantity' => $entry[5],
-                                                       'billperae' => 
$entry[4],
+                                                       'quantity' => $entry[4],
+                                                       'billperae' => 
$entry[5],
                                                        'ns3420_id' => '',
                                                        'dim_d' => '',
                                                        'new_grouping' => 
$section_name,

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2016-08-12 14:53:32 UTC (rev 
15453)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2016-08-12 14:54:46 UTC (rev 
15454)
@@ -3242,6 +3242,10 @@
 
                        foreach ($worksheetNames as $_index => $sheet_name)
                        {
+                               if($_index == 0)
+                               {
+                                       continue;
+                               }
                                $result[$_index]['name'] = $sheet_name;
                                $objPHPExcel->setActiveSheetIndex($_index);
 
@@ -3254,7 +3258,7 @@
 
                                $rows = 
$objPHPExcel->getActiveSheet()->getHighestDataRow();
 
-                               $start = 2; // Read the first line to get the 
headers out of the way
+                               $start = 9; // Read the first line to get the 
headers out of the way
 
                                for ($j = 0; $j < $highestColumnIndex; $j++)
                                {