X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=89e40d0e5d38312705c76fc413d545921921d8b2;hb=00177fae5986f1de25515c7103d10fc36a38cefd;hp=af912eeb5bad354b3944b0e4fc1ae8154f67eb37;hpb=a6ce2c7f3f7ae10f7065fb86121c8d11049617ee;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index af912eeb5..89e40d0e5 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -40,7 +40,8 @@
use Carp;
use CGI;
use List::MoreUtils qw(any uniq apply);
-use List::Util qw(min max first);
+use List::Util qw(sum min max first);
+use List::UtilsBy qw(sort_by uniq_by);
use SL::ClientJS;
use SL::CVar;
@@ -52,8 +53,10 @@ use SL::IC;
use SL::IO;
use SL::File;
use SL::PriceSource;
+use SL::Presenter::Part;
use SL::DB::Contact;
+use SL::DB::Currency;
use SL::DB::Customer;
use SL::DB::Default;
use SL::DB::Language;
@@ -62,6 +65,7 @@ use SL::DB::Vendor;
use SL::Helper::CreatePDF;
use SL::Helper::Flash;
use SL::Helper::PrintOptions;
+use SL::Helper::ShippedQty;
require "bin/mozilla/common.pl";
@@ -123,8 +127,6 @@ sub _check_io_auth {
sub display_row {
$main::lxdebug->enter_sub();
- _check_io_auth();
-
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
@@ -139,7 +141,6 @@ sub display_row {
$form->{weightunit} = $defaults->{weightunit};
my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
- my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order);
my $is_delivery_order = $form->{type} =~ /_delivery_order$/;
my $is_quotation = $form->{type} =~ /_quotation$/;
my $is_invoice = $form->{type} =~ /invoice/;
@@ -169,6 +170,12 @@ sub display_row {
my @row2_sort = qw(
serialnr projectnr reqdate subtotal marge listprice lastcost onhand
);
+ # serialnr is important for delivery_orders
+ if ($form->{type} eq 'sales_delivery_order') {
+ splice @row2_sort, 0, 1;
+ splice @header_sort, 4, 0, "serialnr";
+ }
+
my %column_def = (
runningnumber => { width => 5, value => $locale->text('No.'), display => 1, },
partnumber => { width => 8, value => $locale->text('Number'), display => 1, },
@@ -217,7 +224,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;
@@ -306,8 +313,8 @@ sub display_row {
$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{type_and_classific} = SL::Presenter::Part::type_abbreviation($form->{"part_type_$i"}).
+ SL::Presenter::Part::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))
@@ -315,9 +322,9 @@ sub display_row {
my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2;
- $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
- $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
- . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
+ $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -class => "numeric", -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
+ $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_dialog('qty_$i', '', 'formel_$i', '')", -value => $locale->text('*/'))
+ . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"})
if $form->{"formel_$i"};
$column_data{ship} = '';
@@ -327,7 +334,7 @@ sub display_row {
$ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
$column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}
- . $cgi->hidden(-name => "ship_$i", -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}, $qty_dec));
+ . $cgi->hidden(-name => "ship_$i", -value => $form->{"ship_$i"}, $qty_dec);
my $ship_missing_qty = $form->{"qty_$i"} - $ship_qty;
my $ship_missing_amount = $form->round_amount($ship_missing_qty * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
@@ -335,24 +342,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;
@@ -377,6 +378,16 @@ sub display_row {
}
}
+ my $right_to_edit_prices = (!$is_purchase && $main::auth->assert('sales_edit_prices', 1)) || ($is_purchase && $main::auth->assert('purchase_edit_prices', 1));
+ my $edit_prices = $right_to_edit_prices && (!$::form->{"active_price_source_$i"} || !$price || $price->editable);
+ my $edit_discounts = $right_to_edit_prices && !$::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, -class => "numeric", -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, -"data-validate" => "number", -class => "numeric", -value => $discount_value);
+
if ($is_delivery_order) {
$column_data{stock_in_out} = calculate_stock_in_out($i);
}
@@ -388,7 +399,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
@@ -466,7 +477,7 @@ sub display_row {
map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
push @hidden_vars, grep { defined $form->{"${_}_${i}"} } qw(sellprice discount not_discountable price_factor_id lastcost);
push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
- push @hidden_vars, qw(delivery_order_items_id converted_from_orderitems_id converted_from_delivery_order_items_id);
+ push @hidden_vars, qw(delivery_order_items_id converted_from_orderitems_id converted_from_delivery_order_items_id has_sernumber);
}
my @HIDDENS = map { value => $_}, (
@@ -474,7 +485,7 @@ sub display_row {
$cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
map { ($cgi->hidden("-name" => $_, "-id" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
(qw(bo price_old id inventory_accno bin partsgroup partnotes active_price_source active_discount_source
- income_accno expense_accno listprice assembly taxaccounts ordnumber donumber transdate cusordnumber
+ income_accno expense_accno listprice part_type taxaccounts ordnumber donumber transdate cusordnumber
longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars)
);
@@ -502,6 +513,20 @@ sub display_row {
$main::lxdebug->leave_sub();
}
+sub setup_io_select_item_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Continue'),
+ submit => [ '#form' ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
sub select_item {
$main::lxdebug->enter_sub();
@@ -510,6 +535,8 @@ sub select_item {
my $pre_entered_qty = $params{pre_entered_qty} || 1;
_check_io_auth();
+ setup_io_select_item_action_bar();
+
my $previous_form = $::auth->save_form_in_session(form => $::form);
$::form->{title} = $::myconfig{item_multiselect} ?
$::locale->text('Set count for one or more of the items to select them'):
@@ -556,13 +583,15 @@ sub item_selected {
my $row = $curr_row;
if ($myconfig{item_multiselect}) {
- foreach (grep(/^select_qty_/, keys(%{ $form }))) {
+ my %multi_items;
+ for (keys %$form) {
next unless $form->{$_};
- $_ =~ /^select_qty_(\d+)/;
- $form->{"id_${row}"} = $1;
- $form->{"qty_${row}"} = $form->{$_};
+ next unless /^select_qty_(\d+)/;
+ $multi_items{"id_${row}"} = $1;
+ $multi_items{"qty_${row}"} = $form->{$_};
$row++;
}
+ $form->{$_} = $multi_items{$_} for keys %multi_items;
} else {
$form->{"id_${row}"} = delete($form->{select_item_id}) || croak 'Missing item selection ID';
$row++;
@@ -691,34 +720,39 @@ sub item_selected {
}
sub new_item {
- $main::lxdebug->enter_sub();
+ _check_io_auth();
- my $form = $main::form;
- my %myconfig = %main::myconfig;
+ my $price = $::form->{vc} eq 'customer' ? 'sellprice_as_number' : 'lastcost_as_number';
+ my $previousform = $::auth->save_form_in_session;
+ my $callback = build_std_url("action=return_from_new_item", "previousform=$previousform");
+ my $i = $::form->{rowcount};
- _check_io_auth();
+ my $parts_classification_type = $::form->{vc} eq 'customer' ? 'sales' : 'purchases';
- my $price_key = ($form->{type} =~ m/request_quotation|purchase_order/) || ($form->{script} eq 'ir.pl') ? 'lastcost' : 'sellprice';
+ my @HIDDENS;
+ push @HIDDENS, { 'name' => 'callback', 'value' => $callback };
+ push @HIDDENS, map +{ 'name' => $_, 'value' => $::form->{$_} }, qw(rowcount vc);
+ push @HIDDENS, map +{ 'name' => "part.$_", 'value' => $::form->{"${_}_$i"} }, qw(partnumber description unit price_factor_id);
+ push @HIDDENS, { 'name' => "part.$price", 'value' => $::form->{"sellprice_$i"} };
+ push @HIDDENS, { 'name' => "part.notes", 'value' => $::form->{"longdescription_$i"} };
- # change callback
- $form->{old_callback} = $form->escape($form->{callback}, 1);
- $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
+ push @HIDDENS, { 'name' => "parts_classification_type", 'value' => $parts_classification_type };
- # save all form variables except action in the session and keep the key in the previousform variable
- my $previousform = $::auth->save_form_in_session(skip_keys => [ qw(action) ]);
+ $::form->header;
+ print $::form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
+}
- my @HIDDENS;
- push @HIDDENS, { 'name' => 'previousform', 'value' => $previousform };
- push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc);
- push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit);
- push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} };
- push @HIDDENS, { 'name' => $price_key, 'value' => $form->parse_amount(\%myconfig, $form->{"sellprice_$form->{rowcount}"}) };
- push @HIDDENS, { 'name' => 'notes', 'value' => $form->{"longdescription_$form->{rowcount}"} };
+sub return_from_new_item {
+ _check_io_auth();
- $form->header();
- print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
+ my $part = SL::DB::Manager::Part->find_by(id => delete $::form->{new_parts_id}) or die 'can not find part that was just saved!';
- $main::lxdebug->leave_sub();
+ $::auth->restore_form_from_session(delete $::form->{previousform}, form => $::form);
+
+ $::form->{"id_$::form->{rowcount}"} = $part->id;
+
+ my $url = build_std_url("script=$::form->{script}", "RESTORE_FORM_FROM_SESSION_ID=" . $::auth->save_form_in_session);
+ print $::request->{cgi}->redirect($url);
}
sub check_form {
@@ -880,6 +914,55 @@ sub validate_items {
sub order {
$main::lxdebug->enter_sub();
+ _order();
+
+ if ($::instance_conf->get_feature_experimental_order) {
+
+ # At this point, the record is saved and the exchangerate contains
+ # an unformatted value. _make_record uses RDBO attributes (i.e. _as_number)
+ # to assign values and thus expects an formatted value.
+ $::form->{exchangerate} = $::form->format_amount(\%::myconfig, $::form->{exchangerate});
+
+ my $order = _make_record();
+
+ $order->currency(SL::DB::Currency->new(name => $::form->{currency})->load) if $::form->{currency};
+ $order->globalproject_id(undef) if !$order->globalproject_id;
+ $order->payment_id(undef) if !$order->payment_id;
+
+ my $row = 1;
+ foreach my $item (@{$order->items_sorted}) {
+ $item->custom_variables([]);
+
+ $item->price_factor_id(undef) if !$item->price_factor_id;
+ $item->project_id(undef) if !$item->project_id;
+
+ # autovivify all cvars that are not in the form (cvars_by_config can do it).
+ # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
+ foreach my $var (@{ $item->cvars_by_config }) {
+ my $key = 'ic_cvar_' . $var->config->name . '_' . $row;
+ $var->unparsed_value($::form->{$key});
+ $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
+ }
+ $item->parse_custom_variable_values;
+
+ $row++;
+ }
+
+ require SL::Controller::Order;
+ my $c = SL::Controller::Order->new(order => $order);
+ $c->setup_custom_shipto_from_form($order, $::form);
+ $c->action_edit();
+
+ $main::lxdebug->leave_sub();
+ $::dispatcher->end_request;
+ }
+
+ &display_form;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _order {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
@@ -894,7 +977,7 @@ sub order {
$form->{old_employee_id} = $form->{employee_id};
$form->{old_salesman_id} = $form->{salesman_id};
- delete $form->{$_} foreach (qw(printed emailed queued));
+ delete $form->{$_} foreach (qw(id printed emailed queued));
# When creating a new sales order from a saved sales invoice, reset id,
# ordnumber, transdate and deliverydate as we are creating a new order. This
@@ -953,9 +1036,6 @@ sub order {
}
&prepare_order;
- &display_form;
-
- $main::lxdebug->leave_sub();
}
sub quotation {
@@ -975,7 +1055,7 @@ sub quotation {
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
- delete $form->{$_} foreach (qw(printed emailed queued));
+ delete $form->{$_} foreach (qw(id printed emailed queued quonumber transaction_description));
my $buysell;
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') {
@@ -1224,6 +1304,10 @@ sub print_form {
$form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types();
}
+ if ($form->{format} =~ m{pdf}) {
+ _maybe_attach_zugferd_data($form);
+ }
+
$form->isblank("email", $locale->text('E-mail address missing!'))
if ($form->{media} eq 'email');
$form->isblank("${inv}date",
@@ -1308,6 +1392,8 @@ sub print_form {
$form->get_shipto(\%myconfig);
}
+ $form->set_addition_billing_address_print_variables;
+
$form->{notes} =~ s/^\s+//g;
delete $form->{printer_command};
@@ -1331,7 +1417,7 @@ sub print_form {
# Format dates.
format_dates($output_dateformat, $output_longdates,
- qw(invdate orddate quodate pldate duedate reqdate transdate
+ qw(invdate orddate quodate pldate duedate reqdate transdate tax_point
shippingdate deliverydate validitydate paymentdate
datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate
employee_startdate employee_enddate
@@ -1486,6 +1572,10 @@ sub print_form {
today => DateTime->today,
};
+ if ($defaults->print_interpolate_variables_in_positions) {
+ $form->substitute_placeholders_in_template_arrays({ field => 'description', type => 'text' }, { field => 'longdescription', type => 'html' });
+ }
+
$form->parse_template(\%myconfig);
$form->{callback} = "";
@@ -1590,12 +1680,10 @@ sub relink_accounts {
my $form = $main::form;
my %myconfig = %main::myconfig;
- _check_io_auth();
-
$form->{"taxaccounts"} =~ s/\s*$//;
$form->{"taxaccounts"} =~ s/^\s*//;
foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) {
- map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber));
+ map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber tax_id)); # add tax_id ?
}
$form->{"taxaccounts"} = "";
@@ -1652,43 +1740,21 @@ sub _update_part_information {
$form->{"weight_$i"} = $info->{weight};
$form->{"part_type_$i"} = $info->{part_type};
$form->{"classification_id_$i"} = $info->{classification_id};
+ $form->{"has_sernumber_$i"} = $info->{has_sernumber};
}
$main::lxdebug->leave_sub();
}
sub _update_ship {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- if (!$form->{ordnumber} || !$form->{id}) {
- map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
- $main::lxdebug->leave_sub();
- return;
- }
-
- my $all_units = AM->retrieve_all_units();
-
- my %ship = DO->get_shipped_qty('oe_id' => $form->{id});
-
- foreach my $i (1..$form->{rowcount}) {
- next unless ($form->{"id_${i}"});
-
- $form->{"ship_$i"} = 0;
-
- my $ship_entry = $ship{$i};
+ return unless $::form->{id};
+ my $helper = SL::Helper::ShippedQty->new->calculate($::form->{id});
- next if (!$ship_entry || ($ship_entry->{qty_ordered} <= 0));
-
- my $rowqty = $ship_entry->{qty_ordered} - $ship_entry->{qty_notdelivered};
- $rowqty *= $all_units->{$form->{"unit_$i"}}->{factor} /
- $all_units->{$form->{"partunit_$i"}}->{factor} if !$form->{simple_save};
- $form->{"ship_$i"} = $rowqty;
+ for my $i (1..$::form->{rowcount}) {
+ if (my $oid = $::form->{"orderitems_id_$i"}) {
+ $::form->{"ship_$i"} = $helper->shipped_qty->{$oid};
+ }
}
-
- $main::lxdebug->leave_sub();
}
sub _update_custom_variables {
@@ -1809,7 +1875,7 @@ sub _remove_billed_or_delivered_rows {
# TODO: both of these are makeshift so that price sources can operate on rdbo objects. if
# this ever gets rewritten in controller style, throw this out
sub _make_record_item {
- my ($row) = @_;
+ my ($row, %params) = @_;
my $class = {
sales_order => 'OrderItem',
@@ -1827,25 +1893,51 @@ sub _make_record_item {
$class = 'SL::DB::' . $class;
+ my %translated_methods = (
+ 'SL::DB::OrderItem' => {
+ id => 'parts_id',
+ orderitems_id => 'id',
+ },
+ 'SL::DB::DeliveryOrderItem' => {
+ id => 'parts_id',
+ delivery_order_items_id => 'id',
+ },
+ 'SL::DB::InvoiceItem' => {
+ id => 'parts_id',
+ invoice_id => 'id',
+ },
+ );
+
eval "require $class";
my $obj = $::form->{"orderitems_id_$row"}
? $class->meta->convention_manager->auto_manager_class_name->find_by(id => $::form->{"orderitems_id_$row"})
: $class->new;
- for my $method (apply { s/_$row$// } grep { /_$row$/ } keys %$::form) {
+ for my $key (grep { /_$row$/ } keys %$::form) {
+ my $method = $key;
+ $method =~ s/_$row$//;
+ $method = $translated_methods{$class}{$method} // $method;
+ my $value = $::form->{$key};
if ($obj->meta->column($method)) {
if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
- $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
+ $obj->${\"$method\_as_date"}($value);
} elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
- $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
+ $obj->${\"$method\_as_number"}(($value // '') eq '' ? undef : $value);
} elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
- $obj->$method(!!$::form->{$method});
+ $obj->$method(!!$value);
+ } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) {
+ $obj->$method(($value // '') eq '' ? undef : $value * 1);
} else {
- $obj->$method($::form->{"$method\_$row"});
+ $obj->$method($value);
}
+
+ if ($method eq 'discount') {
+ $obj->discount($obj->discount / 100.0);
+ }
+
} else {
- $obj->{__additional_form_attributes}{$method} = $::form->{"$method\_$row"};
+ $obj->{__additional_form_attributes}{$method} = $value;
}
}
@@ -1853,6 +1945,11 @@ sub _make_record_item {
$obj->part(SL::DB::Part->load_cached($::form->{"id_$row"}));
}
+ if ($obj->can('qty')) {
+ $obj->qty( $obj->qty * $params{factor});
+ $obj->base_qty($obj->base_qty * $params{factor});
+ }
+
return $obj;
}
@@ -1872,6 +1969,8 @@ sub _make_record {
: do { die 'unknown invoice type' };
}
+ my $factor = $::form->{type} =~ m{credit_note} ? -1 : 1;
+
return unless $class;
$class = 'SL::DB::' . $class;
@@ -1889,9 +1988,11 @@ sub _make_record {
if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
$obj->${\"$method\_as_date"}($::form->{$method});
} elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
- $obj->${\"$method\_as_number"}($::form->{$method});
+ $obj->${\"$method\_as_number"}(($::form->{$method} // '') eq '' ? undef : $::form->{$method});
} elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
$obj->$method(!!$::form->{$method});
+ } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) {
+ $obj->$method(($::form->{$method} // '') eq '' ? undef : $::form->{$method} * 1);
} else {
$obj->$method($::form->{$method});
}
@@ -1900,21 +2001,29 @@ sub _make_record {
my @items;
for my $i (1 .. $::form->{rowcount}) {
next unless $::form->{"id_$i"};
- push @items, _make_record_item($i);
+ push @items, _make_record_item($i, factor => $factor);
}
$obj->items(@items) if @items;
$obj->is_sales(!!$obj->customer_id) if $class eq 'SL::DB::DeliveryOrder';
+ if ($class eq 'SL::DB::Invoice') {
+ my $paid = $factor *
+ sum
+ map { $::form->parse_amount(\%::myconfig, $::form->{$_}) }
+ grep { m{^paid_\d+$} }
+ keys %{ $::form };
+ $obj->paid($paid);
+ }
+
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);
+ $print_form->{$_} = $::form->{$_} for qw(type media printer_id storno formname groupitems);
return SL::Helper::PrintOptions->get_print_options(
form => $print_form,
@@ -1924,17 +2033,104 @@ sub setup_sales_purchase_print_options {
);
}
+sub _get_files_for_email_dialog {
+ my %files = map { ($_ => []) } qw(versions files vc_files part_files project_files);
+
+ return %files if !$::instance_conf->get_doc_storage;
+
+ if ($::form->{id}) {
+ $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"};
+ $files{project_files} = [ SL::File->get_all(object_id => $::form->{project_id}, object_type => 'project',file_type => 'attachment') ]
+ if $::form->{project_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 = '';
+ my $email_cc = '';
+ my $record_email;
+ if ($::form->{cp_id}) {
+ $email = SL::DB::Contact->load_cached($::form->{cp_id})->cp_email;
+ }
+ # write a dispatch table if a third type enters
+ # check record mail for sales_invoice
+ if ($::form->{type} eq 'invoice' && (!$email || $::instance_conf->get_invoice_mail_settings ne 'cp')) {
+ # check for invoice_mail if defined (vc.invoice_email)
+ $record_email = SL::DB::Customer->load_cached($::form->{vc_id})->invoice_mail;
+ if ($record_email) {
+ # check if cc for contact is also wanted
+ $email_cc = $email if ($::instance_conf->get_invoice_mail_settings eq 'invoice_mail_cc_cp');
+ $email = $record_email;
+ }
+ }
+ # check record mail for sales_delivery_order
+ if ($::form->{type} eq 'sales_delivery_order') {
+ # check for deliver_order_mail if defined (vc.delivery_order_mail)
+ $record_email = SL::DB::Customer->load_cached($::form->{vc_id})->delivery_order_mail;
+ if ($record_email) {
+ # check if cc for contact is also wanted
+ $email_cc = $email; # always cc to cp
+ $email = $record_email;
+ }
+ }
+ # still no email? use general mail (vc.email)
+ if (!$email && $::form->{vc} && $::form->{vc_id}) {
+ $email = SL::DB::Customer->load_cached($::form->{vc_id})->email if 'customer' eq $::form->{vc};
+ $email = SL::DB::Vendor ->load_cached($::form->{vc_id})->email if 'vendor' eq $::form->{vc};
+ }
+
+ $email = '' if $::form->{type} eq 'purchase_delivery_order';
+
+ $::form->{language} = $::form->get_template_language(\%::myconfig);
+ $::form->{language} = "_" . $::form->{language};
+
+ my %body_params = (record_email => $record_email);
+ if (($::form->{type} eq 'invoice') && $::form->{direct_debit}) {
+ $body_params{translation_type} = "preset_text_invoice_direct_debit";
+ $body_params{fallback_translation_type} = "preset_text_invoice";
+ }
+
+ $::form->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
my $email_form = {
- to => $contact ? $contact->cp_email : '',
+ to => $email,
+ cc => $email_cc,
subject => $::form->generate_email_subject,
+ message => $::form->generate_email_body(%body_params),
attachment_filename => $::form->generate_attachment_filename,
+ js_send_function => 'kivi.SalesPurchase.send_email()',
};
- my $html = $::form->parse_html_template("common/_send_email_dialog", {
- email_form => $email_form,
- show_bcc => $::auth->assert('email_bcc', 'may fail'),
+ 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',
+ is_invoice_mail => ($record_email && $::form->{type} eq 'invoice'),
+ ALL_EMPLOYEES => $::form->{all_employees},
});
print $::form->ajax_response_header, $html;
@@ -1954,10 +2150,48 @@ sub send_sales_purchase_email {
$::form->{media} = 'email';
- print_form("return");
- Common->save_email_status(\%::myconfig, $::form);
+ 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));
}
+
+sub _maybe_attach_zugferd_data {
+ my ($form) = @_;
+
+ my $record = _make_record();
+
+ return if !$record
+ || !$record->can('customer')
+ || !$record->customer
+ || !$record->can('create_pdf_a_print_options')
+ || !$record->can('create_zugferd_data')
+ || !$record->customer->create_zugferd_invoices_for_this_customer;
+
+ eval {
+ my $xmlfile = File::Temp->new;
+ $xmlfile->print($record->create_zugferd_data);
+ $xmlfile->close;
+
+ $form->{TEMPLATE_DRIVER_OPTIONS}->{pdf_a} = $record->create_pdf_a_print_options(zugferd_xmp_data => $record->create_zugferd_xmp_data);
+ $form->{TEMPLATE_DRIVER_OPTIONS}->{pdf_attachments} = [
+ { source => $xmlfile,
+ name => 'factur-x.xml',
+ description => $::locale->text('Factur-X/ZUGFeRD invoice'),
+ relationship => '/Alternative',
+ mime_type => 'text/xml',
+ }
+ ];
+ };
+
+ if (my $e = SL::X::ZUGFeRDValidation->caught) {
+ $::form->error($e->message);
+ }
+}