X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FOrder.pm;h=68863094f04f3afa5b320303b8e603b3bfb2f34d;hb=5067d7bd31514962af9730b33323b831d87164f8;hp=9188556a4ba3c01d94c7866cd103cd422bce991c;hpb=649529bf1cc186b2320c4797b85c411e552a464c;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 9188556a4..68863094f 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -3,7 +3,7 @@ package SL::Controller::CsvImport::Order;
 
 use strict;
 
-use List::MoreUtils qw(any);
+use List::MoreUtils qw(any none);
 
 use SL::Helper::Csv;
 use SL::Controller::CsvImport::Helper::Consistency;
@@ -18,6 +18,7 @@ use SL::DB::Pricegroup;
 use SL::DB::Project;
 use SL::DB::Shipto;
 use SL::DB::TaxZone;
+use SL::DB::Unit;
 use SL::TransNumber;
 
 use parent qw(SL::Controller::CsvImport::BaseMulti);
@@ -25,7 +26,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 units_by) ],
 );
 
 
@@ -34,6 +35,16 @@ sub init_class {
   $self->class(['SL::DB::Order', 'SL::DB::OrderItem']);
 }
 
+sub set_profile_defaults {
+  my ($self) = @_;
+
+  $self->controller->profile->_set_defaults(
+                       order_column    => $::locale->text('Order'),
+                       item_column     => $::locale->text('OrderItem'),
+                       max_amount_diff => 0.02,
+                      );
+};
+
 
 sub init_settings {
   my ($self) = @_;
@@ -201,20 +212,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) = @_;
 
@@ -241,6 +238,13 @@ sub init_pricegroups_by {
   return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_pricegroups } } ) } qw(id pricegroup) };
 }
 
+sub init_units_by {
+  my ($self) = @_;
+
+  my $all_units = SL::DB::Manager::Unit->get_all;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_units } } ) } qw(name) };
+}
+
 sub check_objects {
   my ($self) = @_;
 
@@ -326,7 +330,7 @@ sub handle_order {
 
   if ($vc_obj) {
     # copy from customer if not given
-    foreach (qw(payment_id language_id taxzone_id currency_id)) {
+    foreach (qw(payment_id delivery_term_id language_id taxzone_id currency_id)) {
       $object->$_($vc_obj->$_) unless $object->$_;
     }
   }
@@ -335,37 +339,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) = @_;
 
@@ -405,11 +378,12 @@ sub handle_item {
 
   my $part_obj = SL::DB::Part->new(id => $object->parts_id)->load;
 
+  $self->handle_unit($entry);
+  $self->handle_sellprice($entry);
+
   # copy from part if not given
   $object->description($part_obj->description) unless $object->description;
   $object->longdescription($part_obj->notes)   unless $object->longdescription;
-  $object->unit($part_obj->unit)               unless $object->unit;
-  $object->sellprice($part_obj->sellprice)     unless defined $object->sellprice;
   $object->lastcost($part_obj->lastcost)       unless defined $object->lastcost;
 
   # set to 0 if not given
@@ -421,12 +395,54 @@ sub handle_item {
   $self->check_pricegroup($entry);
 }
 
+sub handle_unit {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # Set unit from part if not given.
+  if (!$object->unit) {
+    $object->unit($object->part->unit);
+    return 1;
+  }
+
+  # Check whether or not unit is valid.
+  if ($object->unit && !$self->units_by->{name}->{ $object->unit }) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Invalid unit');
+    return 0;
+  }
+
+  # Check whether unit is convertible to parts unit
+  if (none { $object->unit eq $_ } map { $_->name } @{ $object->part->unit_obj->convertible_units }) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Invalid unit');
+    return 0;
+  }
+
+  return 1;
+}
+
+sub handle_sellprice {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # Set sellprice from part if not given. Convert with respect to unit.
+  if (!defined $object->sellprice) {
+    my $sellprice = $object->part->sellprice;
+
+    if ($object->unit ne $object->part->unit) {
+      $sellprice = $object->unit_obj->convert_to($sellprice, $object->part->unit_obj);
+    }
+    $object->sellprice($sellprice);
+  }
+}
+
 sub check_part {
   my ($self, $entry) = @_;
 
   my $object = $entry->{object};
 
-  # Check wether or not part ID is valid.
+  # Check whether or not part ID is valid.
   if ($object->parts_id && !$self->parts_by->{id}->{ $object->parts_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid part');
     return 0;
@@ -443,6 +459,17 @@ sub check_part {
     $object->parts_id($part->id);
   }
 
+  # Map description to ID if given.
+  if (!$object->parts_id && $entry->{raw_data}->{description}) {
+    my $part = $self->parts_by->{description}->{ $entry->{raw_data}->{description} };
+    if (!$part) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid part');
+      return 0;
+    }
+
+    $object->parts_id($part->id);
+  }
+
   if ($object->parts_id) {
     $entry->{info_data}->{partnumber} = $self->parts_by->{id}->{ $object->parts_id }->partnumber;
   } else {
@@ -450,6 +477,11 @@ sub check_part {
     return 0;
   }
 
+  if ($self->parts_by->{id}->{ $object->parts_id }->obsolete) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Part is obsolete');
+    return 0;
+  }
+
   return 1;
 }
 
@@ -461,7 +493,7 @@ sub check_contact {
   my $cp_cv_id = $object->customer_id || $object->vendor_id;
   return 0 unless $cp_cv_id;
 
-  # Check wether or not contact ID is valid.
+  # Check whether or not contact ID is valid.
   if ($object->cp_id && !$self->contacts_by->{'cp_cv_id+cp_id'}->{ $cp_cv_id . '+' . $object->cp_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid contact');
     return 0;
@@ -485,71 +517,6 @@ sub check_contact {
   return 1;
 }
 
-sub check_department {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-
-  # Check wether 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 wether 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) = @_;
 
@@ -558,7 +525,7 @@ sub check_ct_shipto {
   my $trans_id = $object->customer_id || $object->vendor_id;
   return 0 unless $trans_id;
 
-  # Check wether or not shipto ID is valid.
+  # Check whether or not shipto ID is valid.
   if ($object->shipto_id && !$self->ct_shiptos_by->{'trans_id+shipto_id'}->{ $trans_id . '+' . $object->shipto_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid shipto');
     return 0;
@@ -572,7 +539,7 @@ sub check_price_factor {
 
   my $object = $entry->{object};
 
-  # Check wether or not price_factor ID is valid.
+  # Check whether or not price_factor ID is valid.
   if ($object->price_factor_id && !$self->price_factors_by->{id}->{ $object->price_factor_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid price factor');
     return 0;
@@ -597,7 +564,7 @@ sub check_pricegroup {
 
   my $object = $entry->{object};
 
-  # Check wether or not pricegroup ID is valid.
+  # Check whether or not pricegroup ID is valid.
   if ($object->pricegroup_id && !$self->pricegroups_by->{id}->{ $object->pricegroup_id }) {
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
     return 0;