X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fio.pl;h=f38ffe20a817ca48b6af5e9fcab301f693b1159c;hb=db68b6fd72b9f0d7d8be953746c0e7d6154f5eaf;hp=5f393936d64e19c7dd41c15dd0904cc52ea8d38a;hpb=75edb8e6c9900ae7a8af8eb644cf064532acc9ea;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 5f393936d..f38ffe20a 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 #
@@ -152,10 +152,17 @@ sub display_row {
qq|
|
. $locale->text('Part Description')
. qq| | |;
- $column_data{ship} =
+ if ($form->{"type"} eq "purchase_order") {
+ $column_data{ship} =
qq||
- . $locale->text('Ship')
- . qq| | |;
+ . $locale->text('Ship rcvd')
+ . qq||;
+ } else {
+ $column_data{ship} =
+ qq||
+ . $locale->text('Ship')
+ . qq| | |;
+ }
$column_data{qty} =
qq||
. $locale->text('Qty')
@@ -235,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
@@ -307,10 +321,10 @@ sub display_row {
if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
$column_data{description} =
- qq| | | |;
+ qq| | |;
} else {
$column_data{description} =
- qq| | |;
+ qq| | |;
}
(my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
@@ -424,7 +438,7 @@ sub display_row {
{"pricegroup_old_$i"}>
{"price_old_$i"}>
-
+
format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
@@ -432,7 +446,7 @@ sub display_row {
{"inventory_accno_$i"}>
-
+
{"income_accno_$i"}>
{"expense_accno_$i"}>
@@ -441,7 +455,7 @@ sub display_row {
-
+
|;
@@ -479,11 +493,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')
@@ -504,7 +519,7 @@ sub display_row {
############## ENDE Neueintrag ##################
map { $form->{"${_}_base"} += $linetotal }
- (split / /, $form->{"taxaccounts_$i"});
+ (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
}
@@ -660,9 +675,10 @@ sub select_item {
-
+
+
{id}>
@@ -725,7 +741,9 @@ sub item_selected {
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
- qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+ qw(id partnumber description sellprice listprice inventory_accno
+ income_accno expense_accno bin unit weight assembly taxaccounts
+ partsgroup formel longdescription not_discountable partnotes);
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
@@ -871,6 +889,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
@@ -879,6 +900,8 @@ sub display_form {
exit;
}
+ Common::webdav_folder($form) if ($webdav);
+
# if ( $form->{print_and_post}
# && $form->{second_run}
# && ($form->{action} eq "display_form")) {
@@ -1105,12 +1128,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;
@@ -1170,6 +1193,10 @@ sub order {
$form->{cp_id} *= 1;
require "$form->{path}/$form->{script}";
+ my $script = $form->{"script"};
+ $script =~ s|.*/||;
+ $script =~ s|.pl$||;
+ $locale = new Locale($language, $script);
map { $form->{"select$_"} = "" } ($form->{vc}, currency);
@@ -1273,8 +1300,10 @@ sub e_mail {
}
if ($myconfig{role} eq 'admin') {
$bcc = qq|
- | . $locale->text('Bcc') . qq| |
- |
+
+ | . $locale->text('Bcc') . qq| |
+ |
+
|;
}
@@ -1294,44 +1323,105 @@ sub e_mail {
$form->{oldmedia} = $form->{media};
$form->{media} = "email";
+ my %formname_translations =
+ (
+ "bin_list" => $locale->text('Bin List'),
+ "credit_note" => $locale->text('Credit Note'),
+ "invoice" => $locale->text('Invoice'),
+ "packing_list" => $locale->text('Packing List'),
+ "pick_list" => $locale->text('Pick List'),
+ "proforma" => $locale->text('Proforma Invoice'),
+ "purchase_order" => $locale->text('Purchase Order'),
+ "request_quotation" => $locale->text('RFQ'),
+ "sales_order" => $locale->text('Confirmation'),
+ "sales_quotation" => $locale->text('Quotation'),
+ "storno_invoice" => $locale->text('Storno Invoice'),
+ "storno_packing_list" => $locale->text('Storno Packing List'),
+ );
+
+ my $attachment_filename = $formname_translations{$form->{"formname"}};
+ my $prefix;
+
+ if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
+ $prefix = "inv";
+ } elsif ($form->{"type"} =~ /_quotation$/) {
+ $prefix = "quo";
+ } else {
+ $prefix = "ord";
+ }
+
+ if ($attachment_filename && $form->{"${prefix}number"}) {
+ $attachment_filename .= "_" . $form->{"${prefix}number"} .
+ ($form->{"format"} =~ /pdf/i ? ".pdf" :
+ $form->{"format"} =~ /postscript/i ? ".ps" :
+ $form->{"format"} =~ /opendocument/i ? ".odt" :
+ $form->{"format"} =~ /html/i ? ".html" : "");
+ $attachment_filename =~ s/ /_/g;
+ my %umlaute =
+ (
+ "ä" => "ae", "ö" => "oe", "ü" => "ue",
+ "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
+ "ß" => "ss"
+ );
+ map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute));
+ } else {
+ $attachment_filename = "";
+ }
+
+ if ($form->{"email"}) {
+ $form->{"fokus"} = "Form.subject";
+ } else {
+ $form->{"fokus"} = "Form.email";
+ }
$form->header;
print qq|
-
+
-