X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fio.pl;h=5b2b55c412b3e4e132a44c79361ec979b2decc5a;hb=98662ad2b031a81c88ce6da0babf6f9d0b37059a;hp=8b0b7fc6930443e873675c843df0066d7d39c2da;hpb=e07e9534d0c611913e31bc620c65e46701e5f000;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 8b0b7fc69..5b2b55c41 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -134,7 +134,7 @@ sub display_row {
my $colspan = $#column_index + 1;
$form->{invsubtotal} = 0;
- map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+ map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -242,6 +242,13 @@ sub display_row {
$delvar = 'reqdate';
}
+ my %projectnumber_labels = ();
+ my @projectnumber_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@projectnumber_values, $item->{"id"});
+ $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
for $i (1 .. $numrows) {
# undo formatting
@@ -348,11 +355,10 @@ sub display_row {
}
$column_data{"unit"} = "
" .
- ($qty_readonly ? " " :
AM->unit_select_html($is_part ? $dimension_units :
$is_assigned ? $service_units : $all_units,
"unit_$i", $this_unit,
- $is_assigned ? $form->{"unit_$i"} : undef))
+ $is_assigned ? $form->{"unit_$i"} : undef)
. " | ";
# build in drop down list for pricesgroups
@@ -486,11 +492,12 @@ sub display_row {
$serialnumber |;
}
- print qq|
- $projectnumber
-
-
-|;
+ print qq|$projectnumber | .
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@projectnumber_values,
+ '-labels' => \%projectnumber_labels,
+ '-default' => $form->{"project_id_$i"}));
+
if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
my $reqdate_term =
($form->{type} eq 'invoice')
@@ -511,7 +518,7 @@ sub display_row {
############## ENDE Neueintrag ##################
map { $form->{"${_}_base"} += $linetotal }
- (split / /, $form->{"taxaccounts_$i"});
+ (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
}
@@ -881,6 +888,9 @@ sub display_form {
relink_accounts();
+ my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+ $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
+
$form->language_payment(\%myconfig);
# if we have a display_form
@@ -1117,12 +1127,12 @@ sub invoicetotal {
$amount = $sellprice * (1 - $discount / 100) * $qty;
map { $form->{"${_}_base"} += $amount }
- (split / /, $form->{"taxaccounts_$i"});
+ (split (/ /, $form->{"taxaccounts_$i"}));
$form->{oldinvtotal} += $amount;
}
map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
- split / /, $form->{taxaccounts}
+ split(/ /, $form->{taxaccounts})
if !$form->{taxincluded};
$form->{oldtotalpaid} = 0;
@@ -1646,10 +1656,16 @@ sub print_options {
}
$form->{groupitems} = "checked" if $form->{groupitems};
+ $form->{remove_draft} = "checked" if $form->{remove_draft};
print qq|
| . $locale->text('Group Items') . qq| |
- {groupitems}> |
+ {groupitems}> | |;
+
+ print qq|
+ | . $locale->text('Remove Draft') . qq| |
+ {remove_draft}> | | if (!$form->{id} && $form->{draft_id});
+ print qq|
@@ -1846,7 +1862,8 @@ sub print_form {
# $locale->text('Quotation Date missing!')
# assign number
- if (!$form->{"${inv}number"} && !$form->{preview}) {
+ $form->{what_done} = $form->{formname};
+ if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
@@ -1859,6 +1876,12 @@ sub print_form {
$form->{rowcount}--;
&{"$display_form"};
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "PRINTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
exit;
}
}
@@ -2034,6 +2057,24 @@ sub print_form {
}
$queued = $form->{queued};
+# saving the history
+ if(!exists $form->{addition}) {
+ if($form->{media} =~ /printer/) {
+ $form->{addition} = "PRINTED";
+ }
+ elsif($form->{media} =~ /email/) {
+ $form->{addition} = "MAILED";
+ }
+ elsif($form->{media} =~ /queue/) {
+ $form->{addition} = "QUEUED";
+ }
+ elsif($form->{media} =~ /screen/) {
+ $form->{addition} = "SCREENED";
+ }
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
$form->parse_template(\%myconfig, $userspath);
$form->{callback} = "";
@@ -2321,7 +2362,6 @@ sub relink_accounts {
$lxdebug->leave_sub();
}
-
sub set_duedate {
$lxdebug->enter_sub();