projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zusätzliche Rechnungsadressen: beim Ausdruck als Variablen verfügbar machen
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
9982d9e
..
89e40d0
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-170,6
+170,12
@@
sub display_row {
my @row2_sort = qw(
serialnr projectnr reqdate subtotal marge listprice lastcost onhand
);
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, },
my %column_def = (
runningnumber => { width => 5, value => $locale->text('No.'), display => 1, },
partnumber => { width => 8, value => $locale->text('Number'), display => 1, },
@@
-471,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}";
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 => $_}, (
}
my @HIDDENS = map { value => $_}, (
@@
-1386,6
+1392,8
@@
sub print_form {
$form->get_shipto(\%myconfig);
}
$form->get_shipto(\%myconfig);
}
+ $form->set_addition_billing_address_print_variables;
+
$form->{notes} =~ s/^\s+//g;
delete $form->{printer_command};
$form->{notes} =~ s/^\s+//g;
delete $form->{printer_command};
@@
-1564,6
+1572,10
@@
sub print_form {
today => DateTime->today,
};
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} = "";
$form->parse_template(\%myconfig);
$form->{callback} = "";
@@
-1728,6
+1740,7
@@
sub _update_part_information {
$form->{"weight_$i"} = $info->{weight};
$form->{"part_type_$i"} = $info->{part_type};
$form->{"classification_id_$i"} = $info->{classification_id};
$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();
}
$main::lxdebug->leave_sub();