X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;fp=bin%2Fmozilla%2Fio.pl;h=793099ff0394268056e77d055354333db6bd966c;hp=f42db465410f74ef90bdf1056654be4f8b62ea2d;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f42db4654..793099ff0 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -28,7 +28,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#
#######################################################################
#
@@ -39,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;
@@ -49,15 +51,24 @@ use SL::CT;
use SL::Locale::String qw(t8);
use SL::IC;
use SL::IO;
+use SL::File;
use SL::PriceSource;
+use SL::Presenter::Part;
+use SL::Util qw(trim);
+use SL::DB::AuthUser;
+use SL::DB::Contact;
+use SL::DB::Currency;
use SL::DB::Customer;
+use SL::DB::DeliveryOrder::TypeData qw();
use SL::DB::Default;
use SL::DB::Language;
use SL::DB::Printer;
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";
@@ -103,7 +114,6 @@ if (-f "bin/mozilla/$::myconfig{login}_io.pl") {
# $locale->text('Nov')
# $locale->text('Dec')
use SL::IS;
-use SL::PE;
use SL::AM;
use Data::Dumper;
@@ -120,8 +130,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;
@@ -136,7 +144,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/;
@@ -159,16 +166,24 @@ 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
);
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, },
+ 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 +227,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 +310,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} = 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))
@@ -308,9 +325,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} = '';
@@ -319,7 +336,8 @@ sub display_row {
$ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor};
$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"};
+ $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}
+ . $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);
@@ -327,24 +345,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;
@@ -369,6 +381,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);
}
@@ -380,7 +402,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
@@ -458,7 +480,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 => $_}, (
@@ -466,7 +488,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)
);
@@ -487,13 +509,27 @@ 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;
}
$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();
@@ -502,12 +538,17 @@ 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} = $::locale->text('Select from one of the items below');
+ $::form->{title} = $::myconfig{item_multiselect} ?
+ $::locale->text('Set count for one or more of the items to select them'):
+ $::locale->text('Select from one of the items below');
$::form->header;
my @item_list = map {
- $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor});
+ # maybe there is a better backend function or way to calc
+ $_->{display_sellprice} = ($_->{price_factor}) ? $_->{sellprice} / $_->{price_factor} : $_->{sellprice};
$_;
} @{ $::form->{item_list} };
@@ -545,13 +586,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++;
@@ -600,7 +643,7 @@ sub item_selected {
my @new_fields =
qw(id partnumber description sellprice listprice inventory_accno
- income_accno expense_accno bin unit weight assembly taxaccounts
+ income_accno expense_accno bin unit weight part_type taxaccounts
partsgroup formel longdescription not_discountable partnotes lastcost
price_factor_id price_factor);
@@ -661,15 +704,14 @@ 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
map {
$form->{"${_}_$i"} =
$form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
- } qw(sellprice lastcost qty) if $form->{item} ne 'assembly';
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{item} ne 'assembly';
+ } qw(sellprice lastcost qty) if $form->{part_type} ne 'assembly';
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{part_type} ne 'assembly';
delete $form->{nextsub};
@@ -681,34 +723,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 {
@@ -723,7 +770,7 @@ sub check_form {
my $count = 0;
# remove any makes or model rows
- if ($form->{item} eq 'assembly') {
+ if ($form->{part_type} eq 'assembly') {
# fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
#$form->{sellprice} = 0;
@@ -756,7 +803,7 @@ sub check_form {
$form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
$form->{assembly_rows} = $count;
- } elsif ($form->{item} !~ m{^(?:part|service)$}) {
+ } elsif ($form->{part_type} !~ m{^(?:part|service)$}) {
remove_emptied_rows(1);
$form->{creditremaining} -= &invoicetotal;
@@ -856,7 +903,7 @@ sub validate_items {
if ($form->{rowcount} == 1) {
flash('warning', $::locale->text('The action you\'ve chosen has not been executed because the document does not contain any item yet.'));
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
for my $i (1 .. $form->{rowcount} - 1) {
@@ -870,6 +917,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;
@@ -884,10 +980,22 @@ sub order {
$form->{old_employee_id} = $form->{employee_id};
$form->{old_salesman_id} = $form->{salesman_id};
- # link doc invoice -> quotation (single id no multi mode)
- $form->{convert_from_ar_ids} = delete $form->{id};
+ 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
+ # workflow is probably mainly used as a template mechanism for creating new
+ # orders from existing invoices, so we probably don't want to link the items.
+ # Is this order function called anywhere else?
+ # The worksflows in oe already call sales_order and purchase_order in oe, not
+ # this general function which now only seems to be called from saved sales
+ # invoices
+ # Why is ordnumber set to invnumber above, does this ever make sense?
+
+ if ( $form->{script} eq 'is.pl' && $form->{type} eq 'invoice' ) {
+ delete $form->{$_} foreach (qw(ordnumber id transdate deliverydate));
+ };
- delete $form->{$_} foreach (qw(printed emailed queued));
my $buysell;
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
@@ -931,9 +1039,6 @@ sub order {
}
&prepare_order;
- &display_form;
-
- $main::lxdebug->leave_sub();
}
sub quotation {
@@ -950,13 +1055,10 @@ sub quotation {
if ($form->{type} =~ /(sales|purchase)_order/) {
$form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
}
- # link doc order -> quotation (single id no multi mode)
- $form->{convert_from_oe_ids} = delete $form->{id};
-
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') {
@@ -1007,220 +1109,32 @@ 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),
- 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();
-}
-
-# generate the printing options displayed at the bottom of oe and is forms.
-# this function will attempt to guess what type of form is displayed, and will generate according options
-#
-# about the coding:
-# this version builds the arrays of options pretty directly. if you have trouble understanding how,
-# the opthash function builds hashrefs which are then pieced together for the template arrays.
-# unneeded options are "undef"ed out, and then grepped out.
-#
-# the inline options is untested, but intended to be used later in metatemplating
sub print_options {
- $main::lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
+ my (%options) = @_;
_check_io_auth();
- my %options = @_;
-
- # names 3 parameters and returns a hashref, for use in templates
- sub opthash { +{ value => shift, selected => shift, oname => shift } }
- my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
-
- # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
- $form->{sendmode} = "attachment";
- $form->{format} = $form->{format} || $myconfig{template_format} || "pdf";
- $form->{copies} = $form->{copies} || $myconfig{copies} || 3;
- $form->{media} = $form->{media} || $myconfig{default_media} || "screen";
- $form->{printer_id} = defined $form->{printer_id} ? $form->{printer_id} :
- defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : "";
-
- $form->{PD}{ $form->{formname} } = "selected";
- $form->{DF}{ $form->{format} } = "selected";
- $form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{formname} } = "selected";
-
- push @FORMNAME, grep $_,
- ($form->{type} eq 'purchase_order') ? (
- opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
- opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List'))
- ) : undef,
- ($form->{type} eq 'credit_note') ?
- opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
- ($form->{type} eq 'sales_order') ? (
- opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- ) : undef,
- ($form->{type} =~ /sales_quotation$/) ?
- opthash('sales_quotation', $form->{PD}{sales_quotation}, $locale->text('Quotation')) : undef,
- ($form->{type} =~ /request_quotation$/) ?
- opthash('request_quotation', $form->{PD}{request_quotation}, $locale->text('Request for Quotation')) : undef,
- ($form->{type} eq 'invoice') ? (
- opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- ) : undef,
- ($form->{type} eq 'invoice' && $form->{storno}) ? (
- opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
- ) : undef,
- ($form->{type} =~ /_delivery_order$/) ? (
- opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')),
- opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')),
- ) : undef;
-
- push @SENDMODE,
- opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
- opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
- if ($form->{media} eq 'email');
-
- my $printable_templates = any { $::lx_office_conf{print_templates}->{$_} } qw(latex opendocument);
- push @MEDIA, grep $_,
- opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- ($printable_templates && $form->{printers} && scalar @{ $form->{printers} }) ?
- opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($printable_templates && !$options{no_queue}) ?
- opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
- if ($form->{media} ne 'email');
-
- push @FORMAT, grep $_,
- ($::lx_office_conf{print_templates}->{opendocument} && $::lx_office_conf{applications}->{openofficeorg_writer} && $::lx_office_conf{applications}->{xvfb}
- && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
- && !$options{no_opendocument_pdf}) ?
- opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
- ($::lx_office_conf{print_templates}->{latex}) ?
- opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
- ($::lx_office_conf{print_templates}->{latex} && !$options{no_postscript}) ?
- opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
- (!$options{no_html}) ?
- opthash("html", $form->{DF}{html}, "HTML") : undef,
- ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
- opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef,
- ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
- opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef;
-
- push @LANGUAGE_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
- if (ref $form->{languages} eq 'ARRAY');
-
- push @PRINTER_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
- if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
-
- @SELECTS = map {
- sname => $_->[1],
- DATA => $_->[0],
- show => !$options{"hide_" . $_->[1]} && scalar @{ $_->[0] }
- },
- [ \@FORMNAME, 'formname', ],
- [ \@LANGUAGE_ID, 'language_id', ],
- [ \@FORMAT, 'format', ],
- [ \@SENDMODE, 'sendmode', ],
- [ \@MEDIA, 'media', ],
- [ \@PRINTER_ID, 'printer_id', ];
-
- my %dont_display_groupitems = (
- 'dunning' => 1,
- 'letter' => 1,
- );
-
- my %template_vars = (
- display_copies => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
- display_remove_draft => (!$form->{id} && $form->{draft_id}),
- display_groupitems => !$dont_display_groupitems{$form->{type}},
- groupitems_checked => $form->{groupitems} ? "checked" : '',
- remove_draft_checked => $form->{remove_draft} ? "checked" : ''
- );
+ my $inline = delete $options{inline};
- my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } );
+ require SL::Helper::PrintOptions;
+ my $print_options = SL::Helper::PrintOptions->get_print_options(
+ form => $::form,
+ myconfig => \%::myconfig,
+ locale => $::locale,
+ options => \%options);
- if ($options{inline}) {
- $main::lxdebug->leave_sub();
+ if ($inline) {
+ $::lxdebug->leave_sub();
return $print_options;
}
print $print_options;
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
+
sub print {
$main::lxdebug->enter_sub();
@@ -1255,7 +1169,7 @@ sub print {
$form->{formname} = $formname;
&edit();
$::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
&print_form($old_form);
@@ -1292,6 +1206,15 @@ sub print_form {
if ($form->{formname} eq "invoice") {
$form->{label} = $locale->text('Invoice');
}
+
+ if ($form->{formname} eq "invoice_for_advance_payment") {
+ $form->{label} = $locale->text('Invoice for Advance Payment');
+ }
+
+ if ($form->{formname} eq "final_invoice") {
+ $form->{label} = $locale->text('Final Invoice');
+ }
+
if ($form->{formname} eq 'sales_order') {
$inv = "ord";
$due = "req";
@@ -1355,6 +1278,17 @@ sub print_form {
$order = 1;
}
+ if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'ic_supply') ) {
+ $inv = "inv";
+ $due = "due";
+ $form->{"${inv}date"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
+ $form->{invnumber} = $form->{ordnumber};
+ $form->{label} = $locale->text('Intra-Community supply');
+ $numberfld = "sonumber";
+ $order = 1;
+ }
+
if ($form->{formname} eq 'request_quotation') {
$inv = "quo";
$due = "req";
@@ -1378,12 +1312,12 @@ 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',
- };
+ if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice invoice_for_advance_payment final_invoice request_quotation purchase_order purchase_delivery_order credit_note)) {
+ $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!'))
@@ -1470,6 +1404,8 @@ sub print_form {
$form->get_shipto(\%myconfig);
}
+ $form->set_addition_billing_address_print_variables;
+
$form->{notes} =~ s/^\s+//g;
delete $form->{printer_command};
@@ -1493,7 +1429,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
@@ -1577,6 +1513,7 @@ sub print_form {
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
+ $form->{addition} = "MAILED";
}
my $emailed = $form->{emailed};
@@ -1647,6 +1584,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} = "";
@@ -1688,7 +1629,7 @@ sub print_form {
}
call_sub($display_form);
- ::end_of_request();
+ $::dispatcher->end_request;
}
my $msg =
@@ -1702,7 +1643,7 @@ sub print_form {
}
if ($form->{printing}) {
call_sub($display_form);
- ::end_of_request();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
@@ -1745,54 +1686,16 @@ 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 contact email phone fax), $::form->{vc} . "number");
-
- $::form->{rowcount}--;
-
- my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
- 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) ]);
- $::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;
-
- print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
- nextsub => $::form->{display_form} || 'display_form',
- vc_obj => $vc_obj,
- });
-
- $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();
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"} = "";
@@ -1844,61 +1747,26 @@ 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};
+ $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();
+ return unless $::form->{id};
+ my $helper = SL::Helper::ShippedQty->new->calculate($::form->{id});
- my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
- 'oe_id' => $form->{id},);
-
- foreach my $i (1..$form->{rowcount}) {
- next unless ($form->{"id_${i}"});
-
- $form->{"ship_$i"} = 0;
-
- my $ship_entry = $ship{$form->{"id_$i"}};
-
- next if (!$ship_entry || ($ship_entry->{qty} <= 0));
-
- my $rowqty =
- ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
- * $all_units->{$form->{"unit_$i"}}->{factor}
- / $all_units->{$form->{"partunit_$i"}}->{factor};
-
- $form->{"ship_$i"} = min($rowqty, $ship_entry->{qty});
- $ship_entry->{qty} -= $form->{"ship_$i"};
- }
-
- foreach my $i (1..$form->{rowcount}) {
- next unless ($form->{"id_${i}"});
-
- my $ship_entry = $ship{$form->{"id_$i"}};
-
- next if (!$ship_entry || ($ship_entry->{qty} <= 0.01));
-
- $form->{"ship_$i"} += $ship_entry->{qty};
- $ship_entry->{qty} = 0;
+ 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 {
@@ -2019,7 +1887,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',
@@ -2027,6 +1895,8 @@ sub _make_record_item {
sales_quotation => 'OrderItem',
request_quotation => 'OrderItem',
invoice => 'InvoiceItem',
+ invoice_for_advance_payment => 'InvoiceItem',
+ final_invoice => 'InvoiceItem',
credit_note => 'InvoiceItem',
purchase_invoice => 'InvoiceItem',
purchase_delivery_order => 'DeliveryOrderItem',
@@ -2037,25 +1907,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;
}
}
@@ -2063,6 +1959,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;
}
@@ -2082,6 +1983,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;
@@ -2099,9 +2002,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});
}
@@ -2110,11 +2015,259 @@ 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::DeliveryOrder' && !$obj->order_type) {
+ $obj->order_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type}));
+ }
+
+ 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->{$_} = $::form->{$_} for qw(type media printer_id storno formname groupitems);
+
+ 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 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 $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";
+ }
+
+ my @employees_with_email = grep {
+ my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login);
+ $user && !!trim($user->get_config_value('email'));
+ } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) };
+
+ my $email_form = {
+ 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 %files = _get_files_for_email_dialog();
+
+ my $all_partner_email_addresses;
+ $all_partner_email_addresses = SL::DB::Customer->load_cached($::form->{vc_id})->get_all_email_addresses() if 'customer' eq $::form->{vc};
+ $all_partner_email_addresses = SL::DB::Vendor ->load_cached($::form->{vc_id})->get_all_email_addresses() if 'vendor' eq $::form->{vc};
+
+ 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 => \@employees_with_email,
+ ALL_PARTNER_EMAIL_ADDRESSES => $all_partner_email_addresses,
+ });
+
+ 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};
+
+ if ($email_form->{additional_to}) {
+ $email_form->{to} = join ', ', grep { $_ } $email_form->{to}, @{$email_form->{additional_to}};
+ delete $email_form->{additional_to};
+ }
+
+ my %field_names = (to => 'email');
+
+ $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form };
+
+ $::form->{media} = 'email';
+
+ $::form->{attachment_policy} //= '';
+
+ # Is an old file version available?
+ my $attfile;
+ if ($::form->{attachment_policy} eq 'old_file') {
+ $attfile = SL::File->get_all(object_id => $id,
+ object_type => $type,
+ file_type => 'document',
+ print_variant => $::form->{formname},);
+ }
+
+ if ($::form->{attachment_policy} eq 'no_file' || ($::form->{attachment_policy} eq 'old_file' && $attfile)) {
+ $::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);
+ }
+}
+
+sub download_factur_x_xml {
+ my ($form) = @_;
+
+ my $record = _make_record();
+
+ die 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;
+
+ my $xml_content = eval { $record->create_zugferd_data };
+
+ if (my $e = SL::X::ZUGFeRDValidation->caught) {
+ $::form->error($e->message);
+ }
+
+ my $attachment_filename = $::form->generate_attachment_filename;
+ $attachment_filename =~ s{\.[^.]+$}{.xml};
+ my %headers = (
+ '-type' => 'application/xml',
+ '-connection' => 'close',
+ '-attachment' => $attachment_filename,
+ '-content-length' => length($xml_content),
+ );
+
+ print $::request->cgi->header(%headers);
+
+ $::locale->with_raw_io(\*STDOUT, sub { print $xml_content });
+}