X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCsvImport%2FOrder.pm;h=4f51d39fe4d631846b09db92757c4ca38edbe9cb;hb=d3b70d7c211862fb85adb5ba5f58fc573067866a;hp=d1a1e461bada91faf891936d590e8e3bc2d8d249;hpb=df141b692d5e193be7ce3a09364565039f953c9f;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index d1a1e461b..4f51d39fe 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -24,7 +24,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 taxzones_by price_factors_by pricegroups_by) ],
+ 'scalar --get_set_init' => [ qw(settings languages_by parts_by contacts_by departments_by projects_by ct_shiptos_by taxzones_by price_factors_by pricegroups_by currencies_by) ],
 );
 
 
@@ -37,7 +37,7 @@ sub init_class {
 sub init_settings {
   my ($self) = @_;
 
-  return { map { ( $_ => $self->controller->profile->get($_) ) } qw(order_column item_column) };
+  return { map { ( $_ => $self->controller->profile->get($_) ) } qw(order_column item_column max_amount_diff) };
 }
 
 
@@ -46,14 +46,25 @@ sub init_profile {
 
   my $profile = $self->SUPER::init_profile;
 
+  # SUPER::init_profile sets row_ident to the translated class name
+  # overwrite it with the user specified settings
+  foreach my $p (@{ $profile }) {
+    if ($p->{row_ident} eq $::locale->text('Order')) {
+      $p->{row_ident} = $self->_order_column;
+    }
+    if ($p->{row_ident} eq $::locale->text('OrderItem')) {
+      $p->{row_ident} = $self->_item_column;
+    }
+  }
+
   foreach my $p (@{ $profile }) {
     my $prof = $p->{profile};
-    if ($p->{row_ident} eq 'Order') {
+    if ($p->{row_ident} eq $self->_order_column) {
       # no need to handle
       delete @{$prof}{qw(delivery_customer_id delivery_vendor_id proforma quotation amount netamount)};
-      # handable, but not handled by now
     }
-    if ($p->{row_ident} eq 'OrderItem') {
+    if ($p->{row_ident} eq $self->_item_column) {
+      # no need to handle
       delete @{$prof}{qw(trans_id)};
     }
   }
@@ -67,10 +78,11 @@ sub setup_displayable_columns {
 
   $self->SUPER::setup_displayable_columns;
 
-  $self->add_displayable_columns('Order',
-                                 { name => 'datatype',         description => $::locale->text('Zeilenkennung')                  },
+  $self->add_displayable_columns($self->_order_column,
+                                 { name => 'datatype',         description => $self->_order_column                              },
                                  { name => 'closed',           description => $::locale->text('Closed')                         },
-                                 { name => 'curr',             description => $::locale->text('Currency')                       },
+                                 { name => 'currency',         description => $::locale->text('Currency')                       },
+                                 { name => 'currency_id',      description => $::locale->text('Currency (database ID)')         },
                                  { name => 'cusordnumber',     description => $::locale->text('Customer Order Number')          },
                                  { name => 'delivered',        description => $::locale->text('Delivered')                      },
                                  { name => 'employee_id',      description => $::locale->text('Employee (database ID)')         },
@@ -111,8 +123,8 @@ sub setup_displayable_columns {
                                  { name => 'shipto_id',        description => $::locale->text('Ship to (database ID)')          },
                                 );
 
-  $self->add_displayable_columns('OrderItem',
-                                 { name => 'datatype',        description => $::locale->text('Zeilenkennung')              },
+  $self->add_displayable_columns($self->_item_column,
+                                 { name => 'datatype',        description => $self->_item_column                           },
                                  { name => 'cusordnumber',    description => $::locale->text('Customer Order Number')      },
                                  { name => 'description',     description => $::locale->text('Description')                },
                                  { name => 'discount',        description => $::locale->text('Discount')                   },
@@ -214,6 +226,12 @@ sub init_pricegroups_by {
   return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_pricegroups } } ) } qw(id pricegroup) };
 }
 
+sub init_currencies_by {
+  my ($self) = @_;
+
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $self->all_currencies } } ) } qw(id name) };
+}
+
 sub check_objects {
   my ($self) = @_;
 
@@ -224,7 +242,7 @@ sub check_objects {
   foreach my $entry (@{ $self->controller->data }) {
     $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
 
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) {
+    if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
 
       my $vc_obj;
       if (any { $entry->{raw_data}->{$_} } qw(customer customernumber customer_id)) {
@@ -244,10 +262,11 @@ sub check_objects {
       $self->check_project($entry, global => 1);
       $self->check_ct_shipto($entry);
       $self->check_taxzone($entry);
+      $self->check_currency($entry);
 
       if ($vc_obj) {
         # copy from customer if not given
-        foreach (qw(payment_id language_id taxzone_id)) {
+        foreach (qw(payment_id language_id taxzone_id currency_id)) {
           $entry->{object}->$_($vc_obj->$_) unless $entry->{object}->$_;
         }
       }
@@ -270,16 +289,16 @@ sub check_objects {
     }
   }
 
-  $self->add_info_columns($self->settings->{'order_column'},
+  $self->add_info_columns($self->_order_column,
                           { header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
   # Todo: access via ->[0] ok? Better: search first order column and use this
-  $self->add_columns($self->settings->{'order_column'},
-                     map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(payment language department globalproject taxzone cp));
-  $self->add_columns($self->settings->{'order_column'}, 'globalproject_id') if exists $self->controller->data->[0]->{raw_data}->{globalprojectnumber};
-  $self->add_columns($self->settings->{'order_column'}, 'cp_id')            if exists $self->controller->data->[0]->{raw_data}->{contact};
+  $self->add_columns($self->_order_column,
+                     map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(payment language department globalproject taxzone cp currency));
+  $self->add_columns($self->_order_column, 'globalproject_id') if exists $self->controller->data->[0]->{raw_data}->{globalprojectnumber};
+  $self->add_columns($self->_order_column, 'cp_id')            if exists $self->controller->data->[0]->{raw_data}->{contact};
 
   foreach my $entry (@{ $self->controller->data }) {
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'item_column'} && $entry->{object}->can('part')) {
+    if ($entry->{raw_data}->{datatype} eq $self->_item_column && $entry->{object}->can('part')) {
 
       next if !$self->check_part($entry);
 
@@ -297,23 +316,22 @@ sub check_objects {
       $self->check_project($entry, global => 0);
       $self->check_price_factor($entry);
       $self->check_pricegroup($entry);
-      
     }
   }
 
-  $self->add_info_columns($self->settings->{'item_column'},
+  $self->add_info_columns($self->_item_column,
                           { header => $::locale->text('Part Number'), method => 'partnumber' });
   # Todo: access via ->[1] ok? Better: search first item column and use this
-  $self->add_columns($self->settings->{'item_column'},
+  $self->add_columns($self->_item_column,
                      map { "${_}_id" } grep { exists $self->controller->data->[1]->{raw_data}->{$_} } qw(project price_factor pricegroup));
-  $self->add_columns($self->settings->{'item_column'}, 'project_id') if exists $self->controller->data->[1]->{raw_data}->{projectnumber};
+  $self->add_columns($self->_item_column, 'project_id') if exists $self->controller->data->[1]->{raw_data}->{projectnumber};
 
   # add orderitems to order
   my $order_entry;
   my @orderitems;
   foreach my $entry (@{ $self->controller->data }) {
     # search first Order
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) {
+    if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
 
       # new order entry: add collected orderitems to the last one
       if (defined $order_entry) {
@@ -323,7 +341,7 @@ sub check_objects {
 
       $order_entry = $entry;
 
-    } elsif ( defined $order_entry && $entry->{raw_data}->{datatype} eq $self->settings->{'item_column'} ) {
+    } elsif ( defined $order_entry && $entry->{raw_data}->{datatype} eq $self->_item_column ) {
       # collect orderitems to add to order (if they have no errors)
       # ( add_orderitems does not work here if we want to call
       #   calculate_prices_and_taxes afterwards ...
@@ -342,7 +360,7 @@ sub check_objects {
   foreach my $entry (@{ $self->controller->data }) {
     next if @{ $entry->{errors} };
 
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) {
+    if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
 
       $entry->{object}->calculate_prices_and_taxes;
 
@@ -353,7 +371,6 @@ sub check_objects {
 
   # If amounts are given, show calculated amounts as info and given amounts (verify_xxx).
   # And throw an error if the differences are too big.
-  my $max_diff = 0.02;
   my @to_verify = ( { column      => 'amount',
                       raw_column  => 'verify_amount',
                       info_header => 'Calc. Amount',
@@ -370,18 +387,18 @@ sub check_objects {
   foreach my $tv (@to_verify) {
     # Todo: access via ->[0] ok? Better: search first order column and use this
     if (exists $self->controller->data->[0]->{raw_data}->{ $tv->{raw_column} }) {
-      $self->add_raw_data_columns($self->settings->{'order_column'}, $tv->{raw_column});
-      $self->add_info_columns($self->settings->{'order_column'},
+      $self->add_raw_data_columns($self->_order_column, $tv->{raw_column});
+      $self->add_info_columns($self->_order_column,
                               { header => $::locale->text($tv->{info_header}), method => $tv->{info_method} });
     }
 
     # check differences
     foreach my $entry (@{ $self->controller->data }) {
       next if @{ $entry->{errors} };
-      if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) {
+      if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
         next if !$entry->{raw_data}->{ $tv->{raw_column} };
         my $parsed_value = $::form->parse_amount(\%::myconfig, $entry->{raw_data}->{ $tv->{raw_column} });
-        if (abs($entry->{object}->${ \$tv->{column} } - $parsed_value) > $max_diff) {
+        if (abs($entry->{object}->${ \$tv->{column} } - $parsed_value) > $self->settings->{'max_amount_diff'}) {
           push @{ $entry->{errors} }, $::locale->text($tv->{err_msg});
         }
       }
@@ -389,13 +406,13 @@ sub check_objects {
   }
 
   # If order has errors set error for orderitems as well
-  my $order_entry;
+  $order_entry = undef;
   foreach my $entry (@{ $self->controller->data }) {
     # Search first order
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) {
+    if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
       $order_entry = $entry;
     } elsif ( defined $order_entry
-              && $entry->{raw_data}->{datatype} eq $self->settings->{'item_column'}
+              && $entry->{raw_data}->{datatype} eq $self->_item_column
               && scalar @{ $order_entry->{errors} } > 0 ) {
       push @{ $entry->{errors} }, $::locale->text('order not valid for this orderitem!');
     }
@@ -606,7 +623,6 @@ sub check_taxzone {
   return 1;
 }
 
-
 sub check_price_factor {
   my ($self, $entry) = @_;
 
@@ -657,6 +673,31 @@ sub check_pricegroup {
   return 1;
 }
 
+sub check_currency {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # Check whether or not currency ID is valid.
+  if ($object->currency_id && !$self->currencies_by->{id}->{ $object->currency_id }) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Invalid currency');
+    return 0;
+  }
+
+  # Map name to ID if given.
+  if (!$object->currency_id && $entry->{raw_data}->{currency}) {
+    my $currency = $self->currencies_by->{name}->{  $entry->{raw_data}->{currency} };
+    if (!$currency) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid currency');
+      return 0;
+    }
+
+    $object->currency_id($currency->id);
+  }
+
+  return 1;
+}
+
 
 sub save_objects {
   my ($self, %params) = @_;
@@ -666,7 +707,7 @@ sub save_objects {
   foreach my $entry (@{ $self->controller->data }) {
     next if @{ $entry->{errors} };
 
-    if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'} && !$entry->{object}->ordnumber) {
+    if ($entry->{raw_data}->{datatype} eq $self->_order_column && !$entry->{object}->ordnumber) {
       my $number = SL::TransNumber->new(type        => 'sales_order',
                                         save        => 1);
       $entry->{object}->ordnumber($number->create_unique());
@@ -678,5 +719,12 @@ sub save_objects {
   $self->SUPER::save_objects(data => $objects_to_save);
 }
 
+sub _order_column {
+  $_[0]->settings->{'order_column'}
+}
+
+sub _item_column {
+  $_[0]->settings->{'item_column'}
+}
 
 1;