X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=7fa1e28309b549b6fe7b531fb97ae627079d0de5;hb=509d1d70d0580e26a4467e123c06d2c8939f32cc;hp=350b0c1ff8c26f6d8deca367cd704f08bd192f33;hpb=a711e76851f29c7e0ac290a279eb4dd984ea7167;p=timetracker.git diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php index 350b0c1f..7fa1e283 100644 --- a/WEB-INF/lib/ttImportHelper.class.php +++ b/WEB-INF/lib/ttImportHelper.class.php @@ -206,11 +206,13 @@ class ttImportHelper { 'status' => $this->currentElement['STATUS'])); } if ($name == 'USER_PROJECT_BIND' && $this->canImport) { - ttUserHelper::insertBind( - $this->userMap[$this->currentElement['USER_ID']], - $this->projectMap[$this->currentElement['PROJECT_ID']], - $this->currentElement['RATE'], - $this->currentElement['STATUS']); + ttUserHelper::insertBind(array( + 'user_id' => $this->userMap[$this->currentElement['USER_ID']], + 'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']], + 'group_id' => $this->group_id, + 'org_id' => $this->org_id, + 'rate' => $this->currentElement['RATE'], + 'status' => $this->currentElement['STATUS'])); } if ($name == 'CLIENT' && $this->canImport) { @@ -241,10 +243,10 @@ class ttImportHelper { $this->invoiceMap[$this->currentElement['ID']] = ttInvoiceHelper::insert(array( 'group_id' => $this->group_id, + 'org_id' => $this->org_id, 'name' => $this->currentElement['NAME'], 'date' => $this->currentElement['DATE'], 'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']], - 'discount' => $this->currentElement['DISCOUNT'], 'status' => $this->currentElement['STATUS'])); } @@ -257,6 +259,7 @@ class ttImportHelper { ttTimeHelper::insert(array( 'user_id' => $this->userMap[$this->currentElement['USER_ID']], 'group_id' => $this->group_id, + 'org_id' => $this->org_id, 'date' => $this->currentElement['DATE'], 'start' => $this->currentElement['START'], 'finish' => $this->currentElement['FINISH'],