X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCsvImport%2FOrder.pm;h=8eebb28b8fd9db046748bac2d33b6e3f97fc9efd;hb=1870f11e7915b768e83e18f8491f1e13d0702ead;hp=1702192f13a30328e0913e7152229b0f9ffe1b82;hpb=aa014f1111f1244dcb9b8cb232240a00ff129e99;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 1702192f1..8eebb28b8 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -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 class name
+  # overwrite it with the user specified settings
   foreach my $p (@{ $profile }) {
-    my $prof = $p->{profile};
     if ($p->{row_ident} eq 'Order') {
+      $p->{row_ident} = $self->settings->{'order_column'};
+    }
+    if ($p->{row_ident} eq 'OrderItem') {
+      $p->{row_ident} = $self->settings->{'item_column'};
+    }
+  }
+
+  foreach my $p (@{ $profile }) {
+    my $prof = $p->{profile};
+    if ($p->{row_ident} eq $self->settings->{'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->settings->{'item_column'}) {
+      # no need to handle
       delete @{$prof}{qw(trans_id)};
     }
   }
@@ -67,8 +78,25 @@ sub setup_displayable_columns {
 
   $self->SUPER::setup_displayable_columns;
 
-  $self->add_displayable_columns('Order',
+  $self->add_displayable_columns($self->settings->{'order_column'},
                                  { name => 'datatype',         description => $::locale->text('Zeilenkennung')                  },
+                                 { name => 'closed',           description => $::locale->text('Closed')                         },
+                                 { name => 'curr',             description => $::locale->text('Currency')                       },
+                                 { name => 'cusordnumber',     description => $::locale->text('Customer Order Number')          },
+                                 { name => 'delivered',        description => $::locale->text('Delivered')                      },
+                                 { name => 'employee_id',      description => $::locale->text('Employee (database ID)')         },
+                                 { name => 'intnotes',         description => $::locale->text('Internal Notes')                 },
+                                 { name => 'marge_percent',    description => $::locale->text('Margepercent')                   },
+                                 { name => 'marge_total',      description => $::locale->text('Margetotal')                     },
+                                 { name => 'notes',            description => $::locale->text('Notes')                          },
+                                 { name => 'ordnumber',        description => $::locale->text('Order Number')                   },
+                                 { name => 'quonumber',        description => $::locale->text('Quotation Number')               },
+                                 { name => 'reqdate',          description => $::locale->text('Reqdate')                        },
+                                 { name => 'salesman_id',      description => $::locale->text('Salesman (database ID)')         },
+                                 { name => 'shippingpoint',    description => $::locale->text('Shipping Point')                 },
+                                 { name => 'shipvia',          description => $::locale->text('Ship via')                       },
+                                 { name => 'transaction_description', description => $::locale->text('Transaction description') },
+                                 { name => 'transdate',        description => $::locale->text('Order Date')                     },
                                  { name => 'verify_amount',    description => $::locale->text('Amount (for verification)')      },
                                  { name => 'verify_netamount', description => $::locale->text('Net amount (for verification)')  },
                                  { name => 'taxincluded',      description => $::locale->text('Tax Included')                   },
@@ -94,7 +122,16 @@ sub setup_displayable_columns {
                                  { name => 'shipto_id',        description => $::locale->text('Ship to (database ID)')          },
                                 );
 
-  $self->add_displayable_columns('OrderItem',
+  $self->add_displayable_columns($self->settings->{'item_column'},
+                                 { name => 'datatype',        description => $::locale->text('Zeilenkennung')              },
+                                 { name => 'cusordnumber',    description => $::locale->text('Customer Order Number')      },
+                                 { name => 'description',     description => $::locale->text('Description')                },
+                                 { name => 'discount',        description => $::locale->text('Discount')                   },
+                                 { name => 'lastcost',        description => $::locale->text('Lastcost')                   },
+                                 { name => 'longdescription', description => $::locale->text('Long Description')           },
+                                 { name => 'marge_percent',   description => $::locale->text('Margepercent')               },
+                                 { name => 'marge_total',     description => $::locale->text('Margetotal')                 },
+                                 { name => 'ordnumber',       description => $::locale->text('Order Number')               },
                                  { name => 'parts_id',        description => $::locale->text('Part (database ID)')         },
                                  { name => 'partnumber',      description => $::locale->text('Part Number')                },
                                  { name => 'project_id',      description => $::locale->text('Project (database ID)')      },
@@ -104,6 +141,12 @@ sub setup_displayable_columns {
                                  { name => 'price_factor',    description => $::locale->text('Price factor (name)')        },
                                  { name => 'pricegroup_id',   description => $::locale->text('Price group (database ID)')  },
                                  { name => 'pricegroup',      description => $::locale->text('Price group (name)')         },
+                                 { name => 'qty',             description => $::locale->text('Quantity')                   },
+                                 { name => 'reqdate',         description => $::locale->text('Reqdate')                    },
+                                 { name => 'sellprice',       description => $::locale->text('Sellprice')                  },
+                                 { name => 'serialnumber',    description => $::locale->text('Serial No.')                 },
+                                 { name => 'subtotal',        description => $::locale->text('Subtotal')                   },
+                                 { name => 'unit',            description => $::locale->text('Unit')                       },
                                 );
 }
 
@@ -265,7 +308,6 @@ sub check_objects {
       $self->check_project($entry, global => 0);
       $self->check_price_factor($entry);
       $self->check_pricegroup($entry);
-      
     }
   }
 
@@ -321,7 +363,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',
@@ -349,7 +390,7 @@ sub check_objects {
       if ($entry->{raw_data}->{datatype} eq $self->settings->{'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});
         }
       }