X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=5588939f8a74805953fa0d3810eb3a3803ec9891;hb=11e6f144c6af375d7b061bde6484266884d6f636;hp=372389b3ddd128eb3b58d4a4efbde3d922ab41f9;hpb=bfaef835c20ba69d5ea4242e67a0dcb4fcbd4f50;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 372389b3d..5588939f8 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -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')
@@ -307,10 +314,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 +431,7 @@ sub display_row {
{"pricegroup_old_$i"}>
{"price_old_$i"}>
-
+
format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
@@ -432,7 +439,7 @@ sub display_row {
{"inventory_accno_$i"}>
-
+
{"income_accno_$i"}>
{"expense_accno_$i"}>
@@ -441,7 +448,7 @@ sub display_row {
-
+
|;
@@ -663,6 +670,7 @@ sub select_item {
+
{id}>
@@ -725,7 +733,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"};
}
@@ -1170,6 +1180,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 +1287,10 @@ sub e_mail {
}
if ($myconfig{role} eq 'admin') {
$bcc = qq|
- | . $locale->text('Bcc') . qq| |
- |
+
+ | . $locale->text('Bcc') . qq| |
+ |
+
|;
}
@@ -1294,44 +1310,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 ($form->{"type"} =~ /invoice/) {
+ $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|
-
+
-