X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/23925086e3efb3a08402c619e1b800ca15b138d5..7410339cd9812d0eb37bf94b51dab13158e77c0e:/WEB-INF/lib/ttImportHelper.class.php

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 26cdfac1..753dc165 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -116,18 +116,21 @@ class ttImportHelper {
       if ($this->canImport) {
         $team_id = ttTeamHelper::insert(array(
           'name' => $this->teamData['NAME'],
-          'address' => $this->teamData['ADDRESS'],
           'currency' => $this->teamData['CURRENCY'],
-          'lock_spec' => $this->teamData['LOCK_SPEC'],
-          'workday_hours' => $this->teamData['WORKDAY_HOURS'],
-          'lang' => $this->teamData['LANG'],
           'decimal_mark' => $this->teamData['DECIMAL_MARK'],
+          'lang' => $this->teamData['LANG'],
           'date_format' => $this->teamData['DATE_FORMAT'],
           'time_format' => $this->teamData['TIME_FORMAT'],
           'week_start' => $this->teamData['WEEK_START'],
-          'plugins' => $this->teamData['PLUGINS'],
           'tracking_mode' => $this->teamData['TRACKING_MODE'],
-          'record_type' => $this->teamData['RECORD_TYPE']));
+          'project_required' => $this->teamData['PROJECT_REQUIRED'],
+          'task_required' => $this->teamData['TASK_REQUIRED'],
+          'record_type' => $this->teamData['RECORD_TYPE'],
+          'uncompleted_indicators' => $this->teamData['UNCOMPLETED_INDICATORS'],
+          'bcc_email' => $this->teamData['BCC_EMAIL'],
+          'plugins' => $this->teamData['PLUGINS'],
+          'lock_spec' => $this->teamData['LOCK_SPEC'],
+          'workday_hours' => $this->teamData['WORKDAY_HOURS']));
         if ($team_id) {
           $this->team_id = $team_id;
           foreach ($this->users as $key=>$user_item) {
@@ -231,6 +234,7 @@ class ttImportHelper {
           'invoice' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
           'note' => (isset($this->currentElement['COMMENT']) ? $this->currentElement['COMMENT'] : ''),
           'billable' => $this->currentElement['BILLABLE'],
+          'paid' => $this->currentElement['PAID'],
           'status' => $this->currentElement['STATUS']));
     }
 
@@ -314,9 +318,7 @@ class ttImportHelper {
       || $this->currentTag == 'LABEL'
       || $this->currentTag == 'VALUE'
       || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS'
-      || $this->currentTag == 'CLIENT_NAME'
-      || $this->currentTag == 'CLIENT_ADDRESS') {
+      || $this->currentTag == 'ADDRESS') {
       if (isset($this->currentElement[$this->currentTag]))
         $this->currentElement[$this->currentTag] .= trim($data);
       else
@@ -328,6 +330,8 @@ class ttImportHelper {
   // startElement, endElement, and dataElement functions are called as many times as necessary.
   // Actual import occurs in the endElement handler.
   function importXml() {
+    global $i18n;
+
     // Do we have a compressed file?
     $compressed = false;
     $file_ext = substr($_FILES['xmlfile']['name'], strrpos($_FILES['xmlfile']['name'], '.') + 1);
@@ -342,13 +346,13 @@ class ttImportHelper {
     // If the file is compressed - uncompress it.
     if ($compressed) {
       if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($GLOBALS['I18N']->getKey('error.sys'));
+        $this->errors->add($i18n->getKey('error.sys'));
         return;
       }
       unlink($_FILES['xmlfile']['tmp_name']);
     } else {
       if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($GLOBALS['I18N']->getKey('error.upload'));
+        $this->errors->add($i18n->getKey('error.upload'));
         return;
       }
     }
@@ -368,7 +372,7 @@ class ttImportHelper {
           xml_get_current_line_number($parser)));
       }
       if (!$this->canImport) {
-        $this->errors->add($GLOBALS['I18N']->getKey('error.user_exists'));
+        $this->errors->add($i18n->getKey('error.user_exists'));
         break;
       }
     }