projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Benutzerdef. Var. als HTML-Feld: allgemeine Infrastruktur
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
3f43c15
..
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, },
@@
-328,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"}
$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);
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);
@@
-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};
@@
-1409,7
+1417,7
@@
sub print_form {
# Format dates.
format_dates($output_dateformat, $output_longdates,
# 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
shippingdate deliverydate validitydate paymentdate
datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate
employee_startdate employee_enddate
@@
-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();
@@
-2021,7
+2034,7
@@
sub setup_sales_purchase_print_options {
}
sub _get_files_for_email_dialog {
}
sub _get_files_for_email_dialog {
- my %files = map { ($_ => []) } qw(versions files vc_files part_files);
+ my %files = map { ($_ => []) } qw(versions files vc_files part_files
project_files
);
return %files if !$::instance_conf->get_doc_storage;
return %files if !$::instance_conf->get_doc_storage;
@@
-2030,6
+2043,8
@@
sub _get_files_for_email_dialog {
$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{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 =
}
my @parts =
@@
-2098,6
+2113,7
@@
sub show_sales_purchase_email_dialog {
$body_params{fallback_translation_type} = "preset_text_invoice";
}
$body_params{fallback_translation_type} = "preset_text_invoice";
}
+ $::form->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
my $email_form = {
to => $email,
cc => $email_cc,
my $email_form = {
to => $email,
cc => $email_cc,
@@
-2114,6
+2130,7
@@
sub show_sales_purchase_email_dialog {
FILES => \%files,
is_customer => $::form->{vc} eq 'customer',
is_invoice_mail => ($record_email && $::form->{type} eq 'invoice'),
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;
});
print $::form->ajax_response_header, $html;