X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FOrder.pm;h=73240e2e3a4f7447a840a962a9245dbce12b3123;hb=ea507623073ea48951f1c1ba38f2a0841b14d47a;hp=d1a1e461bada91faf891936d590e8e3bc2d8d249;hpb=df141b692d5e193be7ce3a09364565039f953c9f;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm index d1a1e461b..73240e2e3 100644 --- a/SL/Controller/CsvImport/Order.pm +++ b/SL/Controller/CsvImport/Order.pm @@ -6,6 +6,7 @@ use strict; use List::MoreUtils qw(any); use SL::Helper::Csv; +use SL::Controller::CsvImport::Helper::Consistency; use SL::DB::Order; use SL::DB::OrderItem; use SL::DB::Part; @@ -24,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 taxzones_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) ], ); @@ -33,11 +34,37 @@ 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) = @_; - 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) }; +} + + +sub init_cvar_configs_by { + my ($self) = @_; + + my $item_cvar_configs = SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'IC' ]); + $item_cvar_configs = [grep { $_->has_flag('editable') } @{ $item_cvar_configs }]; + + my $ccb; + $ccb->{class}->{'SL::DB::Order'} = []; + $ccb->{class}->{'SL::DB::OrderItem'} = $item_cvar_configs; + $ccb->{row_ident}->{$self->_order_column} = []; + $ccb->{row_ident}->{$self->_item_column} = $item_cvar_configs; + + return $ccb; } @@ -46,14 +73,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->{class} eq 'SL::DB::Order') { + $p->{row_ident} = $self->_order_column; + } + if ($p->{class} eq 'SL::DB::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,52 +105,57 @@ sub setup_displayable_columns { $self->SUPER::setup_displayable_columns; - $self->add_displayable_columns('Order', - { 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') }, - { name => 'customer', description => $::locale->text('Customer (name)') }, - { name => 'customernumber', description => $::locale->text('Customer Number') }, - { name => 'customer_id', description => $::locale->text('Customer (database ID)') }, - { name => 'vendor', description => $::locale->text('Vendor (name)') }, - { name => 'vendornumber', description => $::locale->text('Vendor Number') }, - { name => 'vendor_id', description => $::locale->text('Vendor (database ID)') }, - { name => 'language_id', description => $::locale->text('Language (database ID)') }, - { name => 'language', description => $::locale->text('Language (name)') }, - { name => 'payment_id', description => $::locale->text('Payment terms (database ID)') }, - { name => 'payment', description => $::locale->text('Payment terms (name)') }, - { name => 'taxzone_id', description => $::locale->text('Steuersatz (database ID') }, - { name => 'taxzone', description => $::locale->text('Steuersatz (description)') }, - { name => 'cp_id', description => $::locale->text('Contact Person (database ID)') }, - { name => 'contact', description => $::locale->text('Contact Person (name)') }, - { name => 'department_id', description => $::locale->text('Department (database ID)') }, - { name => 'department', description => $::locale->text('Department (description)') }, - { name => 'globalproject_id', description => $::locale->text('Document Project (database ID)') }, - { name => 'globalprojectnumber', description => $::locale->text('Document Project (number)') }, - { name => 'globalproject', description => $::locale->text('Document Project (description)') }, - { name => 'shipto_id', description => $::locale->text('Ship to (database ID)') }, + $self->add_displayable_columns($self->_order_column, + { name => 'datatype', description => $self->_order_column . ' [1]' }, + { name => 'closed', description => $::locale->text('Closed') }, + { 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 => 'delivery_term_id', description => $::locale->text('Delivery terms (database ID)') }, + { name => 'delivery_term', description => $::locale->text('Delivery terms (name)') }, + { 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)') . ' [2]' }, + { name => 'verify_netamount', description => $::locale->text('Net amount (for verification)') . ' [2]'}, + { name => 'taxincluded', description => $::locale->text('Tax Included') }, + { name => 'customer', description => $::locale->text('Customer (name)') }, + { name => 'customernumber', description => $::locale->text('Customer Number') }, + { name => 'customer_id', description => $::locale->text('Customer (database ID)') }, + { name => 'vendor', description => $::locale->text('Vendor (name)') }, + { name => 'vendornumber', description => $::locale->text('Vendor Number') }, + { name => 'vendor_id', description => $::locale->text('Vendor (database ID)') }, + { name => 'language_id', description => $::locale->text('Language (database ID)') }, + { name => 'language', description => $::locale->text('Language (name)') }, + { name => 'payment_id', description => $::locale->text('Payment terms (database ID)') }, + { name => 'payment', description => $::locale->text('Payment terms (name)') }, + { name => 'taxzone_id', description => $::locale->text('Tax zone (database ID)') }, + { name => 'taxzone', description => $::locale->text('Tax zone (description)') }, + { name => 'cp_id', description => $::locale->text('Contact Person (database ID)') }, + { name => 'contact', description => $::locale->text('Contact Person (name)') }, + { name => 'department_id', description => $::locale->text('Department (database ID)') }, + { name => 'department', description => $::locale->text('Department (description)') }, + { name => 'globalproject_id', description => $::locale->text('Document Project (database ID)') }, + { name => 'globalprojectnumber', description => $::locale->text('Document Project (number)') }, + { name => 'globalproject', description => $::locale->text('Document Project (description)') }, + { name => 'shipto_id', description => $::locale->text('Ship to (database ID)') }, ); - $self->add_displayable_columns('OrderItem', - { name => 'datatype', description => $::locale->text('Zeilenkennung') }, + $self->add_cvar_columns_to_displayable_columns($self->_item_column); + + $self->add_displayable_columns($self->_item_column, + { name => 'datatype', description => $self->_item_column . ' [1]' }, { name => 'cusordnumber', description => $::locale->text('Customer Order Number') }, { name => 'description', description => $::locale->text('Description') }, { name => 'discount', description => $::locale->text('Discount') }, @@ -123,6 +166,7 @@ sub setup_displayable_columns { { name => 'ordnumber', description => $::locale->text('Order Number') }, { name => 'parts_id', description => $::locale->text('Part (database ID)') }, { name => 'partnumber', description => $::locale->text('Part Number') }, + { name => 'position', description => $::locale->text('position') }, { name => 'project_id', description => $::locale->text('Project (database ID)') }, { name => 'projectnumber', description => $::locale->text('Project (number)') }, { name => 'project', description => $::locale->text('Project (description)') }, @@ -167,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) = @_; @@ -193,13 +223,6 @@ sub init_ct_shiptos_by { return $sby; } -sub init_taxzones_by { - my ($self) = @_; - - my $all_taxzones = SL::DB::Manager::TaxZone->get_all; - return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_taxzones } } ) } qw(id description) }; -} - sub init_price_factors_by { my ($self) = @_; @@ -219,190 +242,94 @@ sub check_objects { $self->controller->track_progress(phase => 'building data', progress => 0); - my $i; + my $i = 0; my $num_data = scalar @{ $self->controller->data }; 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'}) { - - my $vc_obj; - if (any { $entry->{raw_data}->{$_} } qw(customer customernumber customer_id)) { - $self->check_vc($entry, 'customer_id'); - $vc_obj = SL::DB::Customer->new(id => $entry->{object}->customer_id)->load if $entry->{object}->customer_id; - } elsif (any { $entry->{raw_data}->{$_} } qw(vendor vendornumber vendor_id)) { - $self->check_vc($entry, 'vendor_id'); - $vc_obj = SL::DB::Vendor->new(id => $entry->{object}->vendor_id)->load if $entry->{object}->vendor_id; - } else { - push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor missing'); - } - - $self->check_contact($entry); - $self->check_language($entry); - $self->check_payment($entry); - $self->check_department($entry); - $self->check_project($entry, global => 1); - $self->check_ct_shipto($entry); - $self->check_taxzone($entry); - - if ($vc_obj) { - # copy from customer if not given - foreach (qw(payment_id language_id taxzone_id)) { - $entry->{object}->$_($vc_obj->$_) unless $entry->{object}->$_; - } - } - - # ToDo: salesman and emloyee by name - # salesman from customer or login if not given - if (!$entry->{object}->salesman) { - if ($vc_obj && $vc_obj->salesman_id) { - $entry->{object}->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id)); - } else { - $entry->{object}->salesman(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})); - } - } - - # employee from login if not given - if (!$entry->{object}->employee_id) { - $entry->{object}->employee_id(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})->id); - } - + if ($entry->{raw_data}->{datatype} eq $self->_order_column) { + $self->handle_order($entry); + } elsif ($entry->{raw_data}->{datatype} eq $self->_item_column && $entry->{object}->can('part')) { + $self->handle_item($entry); } + $self->handle_cvars($entry, sub_module => 'orderitems'); + + } continue { + $i++; } - $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}; - - foreach my $entry (@{ $self->controller->data }) { - if ($entry->{raw_data}->{datatype} eq $self->settings->{'item_column'} && $entry->{object}->can('part')) { - - next if !$self->check_part($entry); + $self->add_columns($self->_order_column, + map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(payment delivery_term 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}; - my $part_obj = SL::DB::Part->new(id => $entry->{object}->parts_id)->load; - - # copy from part if not given - $entry->{object}->description($part_obj->description) unless $entry->{object}->description; - $entry->{object}->longdescription($part_obj->notes) unless $entry->{object}->longdescription; - $entry->{object}->unit($part_obj->unit) unless $entry->{object}->unit; - - # set to 0 if not given - $entry->{object}->discount(0) unless $entry->{object}->discount; - $entry->{object}->ship(0) unless $entry->{object}->ship; - - $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}; - - # 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'}) { - - # new order entry: add collected orderitems to the last one - if (defined $order_entry) { - $order_entry->{object}->orderitems(@orderitems); - @orderitems = (); - } - - $order_entry = $entry; - - } elsif ( defined $order_entry && $entry->{raw_data}->{datatype} eq $self->settings->{'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 ... - # so collect orderitems and add them at once) - if (scalar @{ $entry->{errors} } == 0) { - push @orderitems, $entry->{object}; - } - } - } - # add last collected orderitems to last order - if ($order_entry) { - $order_entry->{object}->orderitems(@orderitems); - } + $self->add_columns($self->_item_column, 'project_id') if exists $self->controller->data->[1]->{raw_data}->{projectnumber}; - # calculate prices and taxes - foreach my $entry (@{ $self->controller->data }) { - next if @{ $entry->{errors} }; - - if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'}) { - - $entry->{object}->calculate_prices_and_taxes; + $self->add_cvar_raw_data_columns(); - $entry->{info_data}->{calc_amount} = $entry->{object}->amount_as_number; - $entry->{info_data}->{calc_netamount} = $entry->{object}->netamount_as_number; - } - } - - # 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', - info_method => 'calc_amount', - err_msg => 'Amounts differ too much', - }, - { column => 'netamount', - raw_column => 'verify_netamount', - info_header => 'Calc. Net amount', - info_method => 'calc_netamount', - err_msg => 'Net amounts differ too much', - } ); + $self->add_items_to_order(); + $self->handle_prices_and_taxes(); - 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'}, - { 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'}) { - 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) { - push @{ $entry->{errors} }, $::locale->text($tv->{err_msg}); - } - } - } - } # If order has errors set error for orderitems as well my $order_entry; 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!'); + push @{ $entry->{errors} }, $::locale->text('Error: Invalid order for this order item'); } } } +sub handle_order { + my ($self, $entry) = @_; + + my $object = $entry->{object}; + + my $vc_obj; + if (any { $entry->{raw_data}->{$_} } qw(customer customernumber customer_id)) { + $self->check_vc($entry, 'customer_id'); + $vc_obj = SL::DB::Customer->new(id => $object->customer_id)->load if $object->customer_id; + } elsif (any { $entry->{raw_data}->{$_} } qw(vendor vendornumber vendor_id)) { + $self->check_vc($entry, 'vendor_id'); + $vc_obj = SL::DB::Vendor->new(id => $object->vendor_id)->load if $object->vendor_id; + } else { + push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor missing'); + } + + $self->check_contact($entry); + $self->check_language($entry); + $self->check_payment($entry); + $self->check_delivery_term($entry); + $self->check_department($entry); + $self->check_project($entry, global => 1); + $self->check_ct_shipto($entry); + $self->check_taxzone($entry); + $self->check_currency($entry, take_default => 0); + + if ($vc_obj) { + # copy from customer if not given + foreach (qw(payment_id language_id taxzone_id currency_id)) { + $object->$_($vc_obj->$_) unless $object->$_; + } + } + + $self->handle_salesman($entry); + $self->handle_employee($entry); +} sub check_language { my ($self, $entry) = @_; @@ -435,12 +362,36 @@ sub check_language { return 1; } +sub handle_item { + my ($self, $entry) = @_; + + my $object = $entry->{object}; + return unless $self->check_part($entry); + + my $part_obj = SL::DB::Part->new(id => $object->parts_id)->load; + + # 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 + $object->discount(0) unless $object->discount; + $object->ship(0) unless $object->ship; + + $self->check_project($entry, global => 0); + $self->check_price_factor($entry); + $self->check_pricegroup($entry); +} + sub check_part { my ($self, $entry) = @_; my $object = $entry->{object}; - # Check wether or non 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; @@ -457,6 +408,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 { @@ -475,7 +437,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; @@ -499,71 +461,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) = @_; @@ -572,7 +469,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; @@ -581,38 +478,12 @@ sub check_ct_shipto { return 1; } -sub check_taxzone { - my ($self, $entry) = @_; - - my $object = $entry->{object}; - - # Check wether or not taxzone ID is valid. - if ($object->taxzone_id && !$self->taxzones_by->{id}->{ $object->taxzone_id }) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone'); - return 0; - } - - # Map description to ID if given. - if (!$object->taxzone_id && $entry->{raw_data}->{taxzone}) { - my $taxzone = $self->taxzones_by->{description}->{ $entry->{raw_data}->{taxzone} }; - if (!$taxzone) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone'); - return 0; - } - - $object->taxzone_id($taxzone->id); - } - - return 1; -} - - sub check_price_factor { my ($self, $entry) = @_; 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; @@ -637,7 +508,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; @@ -657,6 +528,89 @@ sub check_pricegroup { return 1; } +sub add_items_to_order { + my ($self) = @_; + + # add orderitems to order + my $order_entry; + my @orderitems; + foreach my $entry (@{ $self->controller->data }) { + # search first/next order + if ($entry->{raw_data}->{datatype} eq $self->_order_column) { + + # next order entry: add collected orderitems to the previous one + if (defined $order_entry) { + $order_entry->{object}->orderitems(@orderitems); + @orderitems = (); + } + + $order_entry = $entry; + + } 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 ... + # so collect orderitems and add them at once ) + push @orderitems, $entry->{object} if (scalar @{ $entry->{errors} } == 0); + } + } + # add last collected orderitems to last order + $order_entry->{object}->orderitems(@orderitems) if $order_entry; +} + +sub handle_prices_and_taxes() { + my ($self) = @_; + + # calculate prices and taxes + foreach my $entry (@{ $self->controller->data }) { + next if @{ $entry->{errors} }; + + if ($entry->{raw_data}->{datatype} eq $self->_order_column && $entry->{object}->orderitems) { + + $entry->{object}->calculate_prices_and_taxes; + + $entry->{info_data}->{calc_amount} = $entry->{object}->amount_as_number; + $entry->{info_data}->{calc_netamount} = $entry->{object}->netamount_as_number; + } + } + + # 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 @to_verify = ( { column => 'amount', + raw_column => 'verify_amount', + info_header => 'Calc. Amount', + info_method => 'calc_amount', + err_msg => 'Amounts differ too much', + }, + { column => 'netamount', + raw_column => 'verify_netamount', + info_header => 'Calc. Net amount', + info_method => 'calc_netamount', + err_msg => 'Net amounts differ too much', + } ); + + 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->_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->_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) > $self->settings->{'max_amount_diff'}) { + push @{ $entry->{errors} }, $::locale->text($tv->{err_msg}); + } + } + } + } + +} sub save_objects { my ($self, %params) = @_; @@ -664,11 +618,12 @@ sub save_objects { # set order number and collect to save my $objects_to_save; foreach my $entry (@{ $self->controller->data }) { + next if $entry->{raw_data}->{datatype} ne $self->_order_column; next if @{ $entry->{errors} }; - if ($entry->{raw_data}->{datatype} eq $self->settings->{'order_column'} && !$entry->{object}->ordnumber) { - my $number = SL::TransNumber->new(type => 'sales_order', - save => 1); + if (!$entry->{object}->ordnumber) { + my $number = SL::TransNumber->new(type => 'sales_order', + save => 1); $entry->{object}->ordnumber($number->create_unique()); } @@ -678,5 +633,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;