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;
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 currencies_by) ],
+ 'scalar --get_set_init' => [ qw(settings languages_by parts_by contacts_by departments_by projects_by ct_shiptos_by price_factors_by pricegroups_by) ],
);
$self->SUPER::setup_displayable_columns;
$self->add_displayable_columns($self->_order_column,
- { name => 'datatype', description => $self->_order_column },
- { 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 => '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)') },
+ { 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_cvar_columns_to_displayable_columns($self->_item_column);
$self->add_displayable_columns($self->_item_column,
- { name => 'datatype', description => $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') },
{ 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)') },
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) = @_;
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) = @_;
{ 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->_order_column,
- map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(payment language department globalproject taxzone cp currency));
+ 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};
} elsif ( defined $order_entry
&& $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');
}
}
$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);
+ $self->check_currency($entry, take_default => 0);
if ($vc_obj) {
# copy from customer if not given
my ($self, $entry) = @_;
my $object = $entry->{object};
- my $vc_obj = SL::DB::Customer->new(id => $object->customer_id)->load if $object->customer_id;
+ 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
$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;
my $object = $entry->{object};
- # Check wether or non part ID is valid.
+ # Check wether 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;
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) = @_;
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 add_items_to_order {
my ($self) = @_;
my $order_entry;
my @orderitems;
foreach my $entry (@{ $self->controller->data }) {
- # search first order
+ # search first/next order
if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
- # new order entry: add collected orderitems to the previous one
+ # next order entry: add collected orderitems to the previous one
if (defined $order_entry) {
$order_entry->{object}->orderitems(@orderitems);
@orderitems = ();
foreach my $entry (@{ $self->controller->data }) {
next if @{ $entry->{errors} };
- if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
+ if ($entry->{raw_data}->{datatype} eq $self->_order_column && $entry->{object}->orderitems) {
$entry->{object}->calculate_prices_and_taxes;
# 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->_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());
}
projects / kivitendo-erp.git / blobdiff