X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=33a5930c423ca2cf8035281a6f047cdfc9a8e8f9;hb=2dfa3a4c75b6f68ab75df739a3e82ceb1b61dcff;hp=b150a3c8d888726bd96c7a10946827fb24ad6b06;hpb=19fb04d1cfad224a0f0c4c3b88494b4605fc6d4e;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b150a3c8d..33a5930c4 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -41,6 +41,7 @@ use Carp;
use CGI;
use List::MoreUtils qw(any uniq apply);
use List::Util qw(min max first);
+use List::UtilsBy qw(sort_by uniq_by);
use SL::ClientJS;
use SL::CVar;
@@ -50,15 +51,18 @@ use SL::CT;
use SL::Locale::String qw(t8);
use SL::IC;
use SL::IO;
+use SL::File;
use SL::PriceSource;
+use SL::DB::Contact;
use SL::DB::Customer;
use SL::DB::Default;
use SL::DB::Language;
use SL::DB::Printer;
use SL::DB::Vendor;
use SL::Helper::CreatePDF;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash;
+use SL::Helper::PrintOptions;
require "bin/mozilla/common.pl";
@@ -159,7 +163,7 @@ sub display_row {
# column_index
my @header_sort = qw(
- runningnumber partnumber description ship ship_missing qty price_factor
+ runningnumber partnumber type_and_classific description ship ship_missing qty price_factor
unit weight price_source sellprice discount linetotal
bin stock_in_out
);
@@ -169,6 +173,8 @@ sub display_row {
my %column_def = (
runningnumber => { width => 5, value => $locale->text('No.'), display => 1, },
partnumber => { width => 8, value => $locale->text('Number'), display => 1, },
+ type_and_classific
+ => { width => 2, value => $locale->text('Type'), display => 1, },
description => { width => 30, value => $locale->text('Part Description'), display => 1, },
ship => { width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, },
ship_missing => { width => 5, value => $locale->text('Not delivered'), display => $show_ship_missing, },
@@ -212,7 +218,7 @@ sub display_row {
# special alignings
my %align = map { $_ => 'right' } qw(qty ship right discount linetotal stock_in_out weight ship_missing);
- my %nowrap = map { $_ => 1 } qw(description unit);
+ my %nowrap = map { $_ => 1 } qw(description unit price_source);
$form->{marge_total} = 0;
$form->{sellprice_total} = 0;
@@ -295,12 +301,14 @@ sub display_row {
my $rows = $form->numtextrows($form->{"description_$i"}, 30, 6);
# quick delete single row
- $column_data{runningnumber} .= q|| .
+ $column_data{runningnumber} = q|| .
q|
|;
$column_data{runningnumber} .= $cgi->textfield(-name => "runningnumber_$i", -id => "runningnumber_$i", -size => 5, -value => $i); # HuT
$column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -id => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"});
+ $column_data{type_and_classific} = $::request->presenter->type_abbreviation($form->{"part_type_$i"}).
+ $::request->presenter->classification_abbreviation($form->{"classification_id_$i"}) if $form->{"id_$i"};
$column_data{description} = (($rows > 1) # if description is too large, use a textbox instead
? $cgi->textarea( -name => "description_$i", -id => "description_$i", -default => $form->{"description_$i"}, -rows => $rows, -columns => 30)
: $cgi->textfield(-name => "description_$i", -id => "description_$i", -value => $form->{"description_$i"}, -size => 30))
@@ -328,24 +336,18 @@ sub display_row {
$column_data{ship_missing} = $form->format_amount(\%myconfig, $ship_missing_qty) . ' ' . $form->{"unit_$i"} . '; ' . $form->format_amount(\%myconfig, $ship_missing_amount, $decimalplaces);
}
- my $sellprice_value = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
- my $discount_value = $form->format_amount(\%myconfig, $form->{"discount_$i"});
- my $edit_prices = $main::auth->assert('edit_prices', 1) && !$::form->{"active_price_source_$i"};
- my $edit_discounts = $main::auth->assert('edit_prices', 1) && !$::form->{"active_discount_source_$i"};
- $column_data{sellprice} = (!$edit_prices)
- ? $cgi->hidden( -name => "sellprice_$i", -id => "sellprice_$i", -value => $sellprice_value) . $sellprice_value
- : $cgi->textfield(-name => "sellprice_$i", -id => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => $sellprice_value);
- $column_data{discount} = (!$edit_discounts)
- ? $cgi->hidden( -name => "discount_$i", -id => "discount_$i", -value => $discount_value) . $discount_value . ' %'
- : $cgi->textfield(-name => "discount_$i", -id => "discount_$i", -size => 3, -value => $discount_value);
$column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2);
$column_data{bin} = $form->{"bin_$i"};
$column_data{weight} = $form->format_amount(\%myconfig, $form->{"qty_$i"} * $form->{"weight_$i"}, 3) . ' ' . $defaults->{weightunit} if $defaults->{show_weight};
+ my $sellprice_value = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+ my $discount_value = $form->format_amount(\%myconfig, $form->{"discount_$i"});
+
+ my $price;
if ($form->{"id_${i}"} && !$is_delivery_order) {
my $price_source = SL::PriceSource->new(record_item => $record_item, record => $record);
- my $price = $price_source->price_from_source($::form->{"active_price_source_$i"});
+ $price = $price_source->price_from_source($::form->{"active_price_source_$i"});
my $discount = $price_source->discount_from_source($::form->{"active_discount_source_$i"});
my $best_price = $price_source->best_price;
my $best_discount = $price_source->best_discount;
@@ -370,6 +372,15 @@ sub display_row {
}
}
+ my $edit_prices = $main::auth->assert('edit_prices', 1) && (!$::form->{"active_price_source_$i"} || !$price || $price->editable);
+ my $edit_discounts = $main::auth->assert('edit_prices', 1) && !$::form->{"active_discount_source_$i"};
+ $column_data{sellprice} = (!$edit_prices)
+ ? $cgi->hidden( -name => "sellprice_$i", -id => "sellprice_$i", -value => $sellprice_value) . $sellprice_value
+ : $cgi->textfield(-name => "sellprice_$i", -id => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => $sellprice_value);
+ $column_data{discount} = (!$edit_discounts)
+ ? $cgi->hidden( -name => "discount_$i", -id => "discount_$i", -value => $discount_value) . $discount_value . ' %'
+ : $cgi->textfield(-name => "discount_$i", -id => "discount_$i", -size => 3, -value => $discount_value);
+
if ($is_delivery_order) {
$column_data{stock_in_out} = calculate_stock_in_out($i);
}
@@ -381,7 +392,7 @@ sub display_row {
'-labels' => \%projectnumber_labels,
'-default' => $form->{"project_id_$i"}
));
- $column_data{reqdate} = qq||;
+ $column_data{reqdate} = qq||;
$column_data{subtotal} = sprintf qq||, $form->{"subtotal_$i"} ? 'checked' : '';
# begin marge calculations
@@ -488,7 +499,7 @@ sub display_row {
HEADER => \@HEADER,
});
- if (0 != ($form->{sellprice_total} * 1)) {
+ if (abs($form->{sellprice_total} * 1) >= 0.01) {
$form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
}
@@ -665,7 +676,6 @@ sub item_selected {
map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded};
$form->{creditremaining} -= $amount;
-
$form->{"runningnumber_$i"} = $i;
# format amounts
@@ -1020,82 +1030,6 @@ sub request_for_quotation {
quotation();
}
-sub edit_e_mail {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- _check_io_auth();
-
- if ($form->{second_run}) {
- $form->{print_and_post} = 0;
- $form->{resubmit} = 0;
- }
-
- $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
-
- if ($form->{"cp_id"}) {
- CT->get_contact(\%myconfig, $form);
- $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
- }
-
- $form->{language} = $form->get_template_language(\%myconfig);
- $form->{language} = "_" . $form->{language} if $form->{language};
-
- my $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
-
- $form->{oldmedia} = $form->{media};
- $form->{media} = "email";
-
- my $global_bcc = AM->get_defaults()->{global_bcc};
-
- $form->{bcc} = join ', ', grep $_, $form->{bcc}, $global_bcc;
-
- my $attachment_filename = $form->generate_attachment_filename();
- my $subject = $form->{subject} || $form->generate_email_subject();
-
- $form->header;
-
- my (@dont_hide_key_list, %dont_hide_key, @hidden_keys);
- @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override login password);
- @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
- @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
-
- print $form->parse_html_template('generic/edit_email',
- { title => $title,
- a_filename => $attachment_filename,
- subject => $subject,
- print_options => print_options('inline' => 1),
- action => 'send_email',
- HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
- SHOW_BCC => $::auth->assert('email_bcc', 'may fail') });
-
- $main::lxdebug->leave_sub();
-}
-
-sub send_email {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- _check_io_auth();
-
- my $callback = $form->{script} . "?action=edit";
- map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id));
-
- print_form("return");
-
- Common->save_email_status(\%myconfig, $form);
-
- $form->{callback} = $callback;
- $form->redirect();
-
- $main::lxdebug->leave_sub();
-}
-
sub print_options {
$::lxdebug->enter_sub();
@@ -1291,11 +1225,7 @@ sub print_form {
$form->{TEMPLATE_DRIVER_OPTIONS} = { };
if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice request_quotation purchase_order purchase_delivery_order credit_note)) {
- $form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = {
- longdescription => 'html',
- partnotes => 'html',
- notes => 'html',
- };
+ $form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types();
}
$form->isblank("email", $locale->text('E-mail address missing!'))
@@ -1489,6 +1419,7 @@ sub print_form {
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
+ $form->{addition} = "MAILED";
}
my $emailed = $form->{emailed};
@@ -1657,45 +1588,6 @@ sub post_as_new {
$main::lxdebug->leave_sub();
}
-sub ship_to {
- $main::lxdebug->enter_sub();
-
- _check_io_auth();
-
- $::form->{print_and_post} = 0 if $::form->{second_run};
-
- map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining);
-
- # get details for customer/vendor
- call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country gln contact email phone fax), $::form->{vc} . "number");
- $::form->{rowcount}--;
-
- my $cvars = SL::DB::Shipto->new->cvars_by_config;
- my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln
- shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
- shiptodepartment_1 shiptodepartment_2);
- my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id), map { "shiptocvar_" . $_->config->name } @{ $cvars } ]);
- $::form->{title} = $::locale->text('Ship to');
- $::form->header;
-
- my $vc_obj = ($::form->{vc} eq 'customer' ? "SL::DB::Customer" : "SL::DB::Vendor")->new(id => $::form->{$::form->{vc} . "_id"})->load;
-
- $_->value($::form->{"shiptocvar_" . $_->config->name}) for @{ $cvars };
-
- print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
- nextsub => $::form->{display_form} || 'display_form',
- vc_obj => $vc_obj,
- cvars => $cvars,
- });
-
- $main::lxdebug->leave_sub();
-}
-
-sub ship_to_entered {
- $::auth->restore_form_from_session(delete $::form->{previousform});
- call_sub($::form->{nextsub});
-}
-
sub relink_accounts {
$main::lxdebug->enter_sub();
@@ -1759,9 +1651,11 @@ sub _update_part_information {
foreach my $i (1..$form->{rowcount}) {
next unless ($form->{"id_${i}"});
- my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
- $form->{"partunit_${i}"} = $info->{unit};
- $form->{"weight_$i"} = $info->{weight};
+ my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
+ $form->{"partunit_${i}"} = $info->{unit};
+ $form->{"weight_$i"} = $info->{weight};
+ $form->{"part_type_$i"} = $info->{part_type};
+ $form->{"classification_id_$i"} = $info->{classification_id};
}
$main::lxdebug->leave_sub();
@@ -1967,7 +1861,6 @@ sub _make_record_item {
}
sub _make_record {
- Form::disconnect_standard_dbh;
my $class = {
sales_order => 'Order',
purchase_order => 'Order',
@@ -2019,3 +1912,95 @@ sub _make_record {
return $obj;
}
+
+sub setup_sales_purchase_print_options {
+ my $print_form = Form->new('');
+ $print_form->{printers} = SL::DB::Manager::Printer->get_all_sorted;
+ $print_form->{languages} = SL::DB::Manager::Language->get_all_sorted;
+
+ $print_form->{$_} = $::form->{$_} for qw(type media language_id printer_id);
+
+ return SL::Helper::PrintOptions->get_print_options(
+ form => $print_form,
+ options => {
+ show_headers => 1,
+ },
+ );
+}
+
+sub _get_files_for_email_dialog {
+ my %files = map { ($_ => []) } qw(versions files vc_files part_files);
+
+ return %files if !$::instance_conf->get_doc_storage;
+
+ $files{versions} = [ SL::File->get_all_versions(object_id => $::form->{id}, object_type => $::form->{type}, file_type => 'document') ];
+ $files{files} = [ SL::File->get_all( object_id => $::form->{id}, object_type => $::form->{type}, file_type => 'attachment') ];
+ $files{vc_files} = [ SL::File->get_all( object_id => $::form->{vc_id}, object_type => $::form->{vc}, file_type => 'attachment') ]
+ if $::form->{vc} && $::form->{"vc_id"};
+
+ my @parts =
+ uniq_by { $_->{id} }
+ grep { $_->{id} }
+ map {
+ +{ id => $::form->{"id_$_"},
+ partnumber => $::form->{"partnumber_$_"},
+ }
+ } (1 .. $::form->{rowcount});
+
+ foreach my $part (@parts) {
+ my @pfiles = SL::File->get_all(object_id => $part->{id}, object_type => 'part');
+ push @{ $files{part_files} }, map { +{ %{ $_ }, partnumber => $part->{partnumber} } } @pfiles;
+ }
+
+ foreach my $key (keys %files) {
+ $files{$key} = [ sort_by { lc $_->{db_file}->{file_name} } @{ $files{$key} } ];
+ }
+
+ return %files;
+}
+
+sub show_sales_purchase_email_dialog {
+ my $contact = $::form->{cp_id} ? SL::DB::Contact->load_cached($::form->{cp_id}) : undef;
+ my $email_form = {
+ to => $contact ? $contact->cp_email : '',
+ subject => $::form->generate_email_subject,
+ attachment_filename => $::form->generate_attachment_filename,
+ };
+
+ my %files = _get_files_for_email_dialog();
+ my $html = $::form->parse_html_template("common/_send_email_dialog", {
+ email_form => $email_form,
+ show_bcc => $::auth->assert('email_bcc', 'may fail'),
+ FILES => \%files,
+ is_customer => $::form->{vc} eq 'customer',
+ });
+
+ print $::form->ajax_response_header, $html;
+}
+
+sub send_sales_purchase_email {
+ my $type = $::form->{type};
+ my $id = $::form->{id};
+ my $script = $type =~ m{sales_order|purchase_order|quotation} ? 'oe.pl'
+ : $type =~ m{delivery_} ? 'do.pl'
+ : 'is.pl';
+
+ my $email_form = delete $::form->{email_form};
+ my %field_names = (to => 'email');
+
+ $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form };
+
+ $::form->{media} = 'email';
+
+ if (($::form->{attachment_policy} // '') =~ m{^(?:old_file|no_file)$}) {
+ $::form->send_email(\%::myconfig, 'pdf');
+
+ } else {
+ print_form("return");
+ Common->save_email_status(\%::myconfig, $::form);
+ }
+
+ flash_later('info', $::locale->text('The email has been sent.'));
+
+ print $::form->redirect_header($script . '?action=edit&id=' . $::form->escape($id) . '&type=' . $::form->escape($type));
+}