projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debitorenbuchung: Wechselkurs bei Zahlung formatieren
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
c6439af
..
a89a311
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-919,7
+919,6
@@
sub order {
$item->price_factor_id(undef) if !$item->price_factor_id;
$item->project_id(undef) if !$item->project_id;
$item->price_factor_id(undef) if !$item->price_factor_id;
$item->project_id(undef) if !$item->project_id;
- $item->discount($item->discount/100.0);
# 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).
# 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).
@@
-1661,7
+1660,7
@@
sub relink_accounts {
$form->{"taxaccounts"} =~ s/\s*$//;
$form->{"taxaccounts"} =~ s/^\s*//;
foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) {
$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"} = "";
}
$form->{"taxaccounts"} = "";
@@
-2001,7
+2000,7
@@
sub setup_sales_purchase_print_options {
$print_form->{printers} = SL::DB::Manager::Printer->get_all_sorted;
$print_form->{languages} = SL::DB::Manager::Language->get_all_sorted;
$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 storno);
+ $print_form->{$_} = $::form->{$_} for qw(type media language_id printer_id storno
formname groupitems
);
return SL::Helper::PrintOptions->get_print_options(
form => $print_form,
return SL::Helper::PrintOptions->get_print_options(
form => $print_form,
@@
-2134,11
+2133,14
@@
sub send_sales_purchase_email {
sub _maybe_attach_zugferd_data {
my ($form) = @_;
sub _maybe_attach_zugferd_data {
my ($form) = @_;
- return if !$::instance_conf->get_create_zugferd_invoices;
-
my $record = _make_record();
my $record = _make_record();
- return if !$record || !$record->can('create_pdf_a_print_options') || !$record->can('create_zugferd_data');
+ 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;
eval {
my $xmlfile = File::Temp->new;