From: G. Richardson <information@kivitendo-premium.de>
Date: Mon, 29 Feb 2016 10:55:50 +0000 (+0100)
Subject: Auftragsimport - Methoden ausgelagert
X-Git-Tag: release-3.4.1~383
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ea507623073ea48951f1c1ba38f2a0841b14d47a;p=kivitendo-erp.git

Auftragsimport - Methoden ausgelagert

für Prüfung von Abteilung, Projekt, Bearbeiter und Verkäufer

Vorbereitung für Debitorenbuchungsimport
---

diff --git a/SL/Controller/CsvImport/Helper/Consistency.pm b/SL/Controller/CsvImport/Helper/Consistency.pm
index 82ec56371..da9f455bc 100644
--- a/SL/Controller/CsvImport/Helper/Consistency.pm
+++ b/SL/Controller/CsvImport/Helper/Consistency.pm
@@ -2,14 +2,17 @@ package SL::Controller::CsvImport::Helper::Consistency;
 
 use strict;
 
+use Data::Dumper;
 use SL::DB::Default;
 use SL::DB::Currency;
 use SL::DB::TaxZone;
+use SL::DB::Project;
+use SL::DB::Department;
 
 use SL::Helper::Csv::Error;
 
 use parent qw(Exporter);
-our @EXPORT = qw(check_currency check_taxzone);
+our @EXPORT = qw(check_currency check_taxzone check_project check_department check_customer_vendor handle_salesman handle_employee);
 
 #
 # public functions
@@ -92,20 +95,138 @@ sub check_taxzone {
   if (!$object->taxzone_id && $params{take_default}) {
     # my $default_id = $self->settings->{'default_taxzone'};
     my $default_id = $self->controller->profile->get('default_taxzone');
+    $default_id ||= _default_taxzone_id($self);
     $object->taxzone_id($default_id);
     # check if default taxzone_id is valid just to be sure
     if (! _taxzones_by($self)->{id}->{ $object->taxzone_id }) {
       push @{ $entry->{errors} }, $::locale->text('Error with default taxzone');
       return 0;
-    };
+    }
   };
 
   # for the order import at this stage $object->taxzone_id may still not be
-  # defined, in this case the customer/vendor taxzone will be used.
+  # defined, in this case the customer/vendor taxzone will be used later
+  if ( defined $object->taxzone_id ) {
+    $entry->{info_data}->{taxzone} = _taxzones_by($self)->{id}->{ $object->taxzone_id }->description;
+  };
+
+  return 1;
+}
+
+sub check_project {
+  my ($self, $entry, %params) = @_;
+
+  my $id_column          = ($params{global} ? 'global' : '') . 'project_id';
+  my $number_column      = ($params{global} ? 'global' : '') . 'projectnumber';
+  my $description_column = ($params{global} ? 'global' : '') . 'project';
+
+  my $object = $entry->{object};
+
+  # Check whether or not project ID is valid.
+  if ($object->$id_column) {
+    if (! _projects_by($self)->{id}->{ $object->$id_column }) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
+      return 0;
+    } else {
+      $entry->{info_data}->{$number_column} = _projects_by($self)->{id}->{ $object->$id_column }->description;
+    };
+  }
+
+  my $proj;
+  # Map number to ID if given.
+  if (!$object->$id_column && $entry->{raw_data}->{$number_column}) {
+    $proj = _projects_by($self)->{projectnumber}->{ $entry->{raw_data}->{$number_column} };
+    if (!$proj) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
+      return 0;
+    }
+
+    $object->$id_column($proj->id);
+  }
+
+  # Map description to ID if given.
+  if (!$object->$id_column && $entry->{raw_data}->{$description_column}) {
+    $proj = _projects_by($self)->{description}->{ $entry->{raw_data}->{$description_column} };
+    if (!$proj) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
+      return 0;
+    }
+
+    $object->$id_column($proj->id);
+  }
+
+  if ( $proj ) {
+    $entry->{info_data}->{"$description_column"} = $proj->description;
+    $entry->{info_data}->{"$number_column"}      = $proj->projectnumber;
+  };
 
   return 1;
 }
 
+sub check_department {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # Check whether or not department ID was assigned and is valid.
+  if ($object->department_id) {
+    if (!_departments_by($self)->{id}->{ $object->department_id }) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid department');
+      return 0;
+    } else {
+      # add department description as well, more feedback for user
+      $entry->{info_data}->{department} = _departments_by($self)->{id}->{ $object->department_id }->description;
+    };
+  }
+
+  # Map department description to ID if given.
+  if (!$object->department_id && $entry->{raw_data}->{department}) {
+    $entry->{info_data}->{department} = $entry->{raw_data}->{department};
+    my $dep = _departments_by($self)->{description}->{ $entry->{raw_data}->{department} };
+    if (!$dep) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid department');
+      return 0;
+    }
+    $entry->{info_data}->{department} = $dep->description;
+    $object->department_id($dep->id);
+  }
+
+  return 1;
+}
+
+# ToDo: salesman by name
+sub handle_salesman {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+  my $vc_obj;
+  $vc_obj    = SL::DB::Customer->new(id => $object->customer_id)->load if $object->can('customer') && $object->customer_id;
+  $vc_obj    = SL::DB::Vendor->new(id   => $object->vendor_id)->load   if (!$vc_obj && $object->can('vendor') && $object->vendor_id);
+
+  # salesman from customer/vendor or login if not given
+  if (!$object->salesman) {
+    if ($vc_obj && $vc_obj->salesman_id) {
+      $object->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id));
+    } else {
+      $object->salesman(SL::DB::Manager::Employee->find_by(login => $::myconfig{login}));
+    }
+  }
+}
+
+# ToDo: employee by name
+sub handle_employee {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # employee from login if not given
+  if (!$object->employee_id) {
+    $object->employee_id(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})->id);
+  }
+}
+
+
+
 #
 # private functions
 #
@@ -128,6 +249,26 @@ sub _default_currency_id {
   return SL::DB::Default->get->currency_id;
 }
 
+sub _default_taxzone_id {
+  my ($self) = @_;
+
+  return SL::DB::Manager::TaxZone->get_all_sorted(query => [ obsolete => 0 ])->[0]->id;
+}
+
+sub _departments_by {
+  my ($self) = @_;
+
+  my $all_departments = SL::DB::Manager::Department->get_all;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_departments } } ) } qw(id description) };
+}
+
+sub _projects_by {
+  my ($self) = @_;
+
+  my $all_projects = SL::DB::Manager::Project->get_all;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_projects } } ) } qw(id projectnumber description) };
+}
+
 sub _taxzones_by {
   my ($self) = @_;
 
diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index e0935c0e6..73240e2e3 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -25,7 +25,7 @@ use parent qw(SL::Controller::CsvImport::BaseMulti);
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(settings languages_by parts_by contacts_by departments_by projects_by ct_shiptos_by price_factors_by pricegroups_by) ],
+ 'scalar --get_set_init' => [ qw(settings languages_by parts_by contacts_by ct_shiptos_by price_factors_by pricegroups_by) ],
 );
 
 
@@ -211,20 +211,6 @@ sub init_contacts_by {
   return $cby;
 }
 
-sub init_departments_by {
-  my ($self) = @_;
-
-  my $all_departments = SL::DB::Manager::Department->get_all;
-  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_departments } } ) } qw(id description) };
-}
-
-sub init_projects_by {
-  my ($self) = @_;
-
-  my $all_projects = SL::DB::Manager::Project->get_all;
-  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_projects } } ) } qw(id projectnumber description) };
-}
-
 sub init_ct_shiptos_by {
   my ($self) = @_;
 
@@ -345,37 +331,6 @@ sub handle_order {
   $self->handle_employee($entry);
 }
 
-# ToDo: salesman by name
-sub handle_salesman {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-  my $vc_obj;
-  $vc_obj    = SL::DB::Customer->new(id => $object->customer_id)->load if $object->customer_id;
-  $vc_obj    = SL::DB::Vendor->new(id   => $object->vendor_id)->load   if (!$vc_obj && $object->vendor_id);
-
-  # salesman from customer/vendor or login if not given
-  if (!$object->salesman) {
-    if ($vc_obj && $vc_obj->salesman_id) {
-      $object->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id));
-    } else {
-      $object->salesman(SL::DB::Manager::Employee->find_by(login => $::myconfig{login}));
-    }
-  }
-}
-
-# ToDo: employee by name
-sub handle_employee {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-
-  # employee from login if not given
-  if (!$object->employee_id) {
-    $object->employee_id(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})->id);
-  }
-}
-
 sub check_language {
   my ($self, $entry) = @_;
 
@@ -506,71 +461,6 @@ sub check_contact {
   return 1;
 }
 
-sub check_department {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-
-  # Check whether or not department ID is valid.
-  if ($object->department_id && !$self->departments_by->{id}->{ $object->department_id }) {
-    push @{ $entry->{errors} }, $::locale->text('Error: Invalid department');
-    return 0;
-  }
-
-  # Map description to ID if given.
-  if (!$object->department_id && $entry->{raw_data}->{department}) {
-    my $dep = $self->departments_by->{description}->{ $entry->{raw_data}->{department} };
-    if (!$dep) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid department');
-      return 0;
-    }
-
-    $object->department_id($dep->id);
-  }
-
-  return 1;
-}
-
-sub check_project {
-  my ($self, $entry, %params) = @_;
-
-  my $id_column          = ($params{global} ? 'global' : '') . 'project_id';
-  my $number_column      = ($params{global} ? 'global' : '') . 'projectnumber';
-  my $description_column = ($params{global} ? 'global' : '') . 'project';
-
-  my $object = $entry->{object};
-
-  # Check whether or not projetc ID is valid.
-  if ($object->$id_column && !$self->projects_by->{id}->{ $object->$id_column }) {
-    push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
-    return 0;
-  }
-
-  # Map number to ID if given.
-  if (!$object->$id_column && $entry->{raw_data}->{$number_column}) {
-    my $proj = $self->projects_by->{projectnumber}->{ $entry->{raw_data}->{$number_column} };
-    if (!$proj) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
-      return 0;
-    }
-
-    $object->$id_column($proj->id);
-  }
-
-  # Map description to ID if given.
-  if (!$object->$id_column && $entry->{raw_data}->{$description_column}) {
-    my $proj = $self->projects_by->{description}->{ $entry->{raw_data}->{$description_column} };
-    if (!$proj) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid project');
-      return 0;
-    }
-
-    $object->$id_column($proj->id);
-  }
-
-  return 1;
-}
-
 sub check_ct_shipto {
   my ($self, $entry) = @_;