projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
installcheck: Spacing der Ausgabe korrigiert.
[kivitendo-erp.git]
/
bin
/
mozilla
/
invoice_io.pl
diff --git
a/bin/mozilla/invoice_io.pl
b/bin/mozilla/invoice_io.pl
index
8c803fb
..
5f6c141
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;
@@
-126,7
+125,8
@@
sub set_pricegroup {
if ($item->{selected} && ($pricegroup_id != 0)) {
$form->{"pricegroup_old_$j"} = $pricegroup_id;
$form->{"price_new_$j"} = $price;
if ($item->{selected} && ($pricegroup_id != 0)) {
$form->{"pricegroup_old_$j"} = $pricegroup_id;
$form->{"price_new_$j"} = $price;
- $form->{"sellprice_$j"} = $price;
+ # edit: don't change the sellprice here
+ # $form->{"sellprice_$j"} = $price; # this must only be updated for existing articles, not new ones
}
if ($pricegroup_id == 0) {
$form->{"price_new_$j"} = $form->{"sellprice_$j"};
}
if ($pricegroup_id == 0) {
$form->{"price_new_$j"} = $form->{"sellprice_$j"};
@@
-162,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}
@@
-205,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";
@@
-231,14
+230,6
@@
sub display_form {
$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;