projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alte testpage für parts entfernen
[kivitendo-erp.git]
/
bin
/
mozilla
/
invoice_io.pl
diff --git
a/bin/mozilla/invoice_io.pl
b/bin/mozilla/invoice_io.pl
index
9527686
..
843a32f
100644
(file)
--- a/
bin/mozilla/invoice_io.pl
+++ b/
bin/mozilla/invoice_io.pl
@@
-34,7
+34,6
@@
#######################################################################
use CGI;
#######################################################################
use CGI;
-use CGI::Ajax;
use List::Util qw(max);
use SL::Common;
use List::Util qw(max);
use SL::Common;
@@
-163,7
+162,7
@@
sub display_form {
::end_of_request();
}
::end_of_request();
}
- Common::webdav_folder($form)
if ($main::webdav)
;
+ Common::webdav_folder($form);
# if ( $form->{print_and_post}
# && $form->{second_run}
# if ( $form->{print_and_post}
# && $form->{second_run}
@@
-206,8
+205,7
@@
sub display_form {
my $numrows = ++$form->{rowcount};
my $subroutine = "display_row";
my $numrows = ++$form->{rowcount};
my $subroutine = "display_row";
- if ($form->{item} eq 'part') {
-
+ if ($form->{item} =~ /(part|service)/) {
#set preisgruppenanzahl
$numrows = $form->{price_rows};
$subroutine = "price_row";
#set preisgruppenanzahl
$numrows = $form->{price_rows};
$subroutine = "price_row";
@@
-226,20
+224,15
@@
sub display_form {
$numrows = ++$form->{makemodel_rows};
$subroutine = "makemodel_row";
$numrows = ++$form->{makemodel_rows};
$subroutine = "makemodel_row";
+ # assemblies are built from components, they aren't purchased from a vendor
+ # also the lastcost_$i from makemodel conflicted with the component lastcost_$i
+ # so we don't need the makemodel rows for assemblies
# create makemodel rows
# create makemodel rows
- &{$subroutine}($numrows);
+
#
&{$subroutine}($numrows);
$numrows = ++$form->{assembly_rows};
$subroutine = "assembly_row";
}
$numrows = ++$form->{assembly_rows};
$subroutine = "assembly_row";
}
- if ($form->{item} eq 'service') {
- $numrows = $form->{price_rows};
- $subroutine = "price_row";
-
- &{$subroutine}($numrows);
-
- $numrows = 0;
- }
# create rows
&{$subroutine}($numrows) if $numrows;
# create rows
&{$subroutine}($numrows) if $numrows;