generictranslations.pl nachgereicht

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 6b4888b..f890cee 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -144,7 +144,7 @@ sub display_row {
     {  id => 'serialnr',      width => 10,    value => $locale->text('Serial No.'),           display => 0, },
     {  id => 'projectnr',     width => 10,    value => $locale->text('Project'),              display => 0, },
     {  id => 'sellprice',     width => 15,    value => $locale->text('Price'),                display => !$is_delivery_order, },
-    {  id => 'sellprice_pg',  width => 8,    value => $locale->text('Pricegroup'),           display => ($form->{type} =~ /^sales_/) && !$is_delivery_order,  },
+    {  id => 'sellprice_pg',  width => 8,     value => $locale->text('Pricegroup'),           display => ($form->{type} =~ /^sales_/) && !$is_delivery_order,  },
     {  id => 'discount',      width => 5,     value => $locale->text('Discount'),             display => !$is_delivery_order, },
     {  id => 'linetotal',     width => 10,    value => $locale->text('Extended'),             display => !$is_delivery_order, },
     {  id => 'bin',           width => 10,    value => $locale->text('Bin'),                  display => 0, },
@@ -689,13 +689,14 @@ sub check_form {
 
   } elsif ($form->{item} eq 'assembly') {
 
-    $form->{sellprice} = 0;
+    # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
+    #$form->{sellprice} = 0;
     $form->{weight}    = 0;
     map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-      qw(listprice rop stock);
+      qw(listprice sellprice rop stock);
 
     @flds =
-      qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup);
+      qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup lastcost);
 
     for my $i (1 .. ($form->{assembly_rows} - 1)) {
       if ($form->{"qty_$i"}) {
@@ -708,12 +709,13 @@ sub check_form {
 
         #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
 
-        $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"});
-        $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"});
+        # fuer assemblies auskommentiert. siehe oben
+       #    $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
+        $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1));
         $count++;
       }
     }
-
+    # kann das hier auch weg? s.o. jb
     $form->{sellprice} = $form->round_amount($form->{sellprice}, 2);
 
     $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
@@ -883,7 +885,7 @@ sub order {
   for $i (1 .. $form->{rowcount}) {
     map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"})
             if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
+        qw(ship qty sellprice listprice basefactor discount));
   }
 
   &prepare_order;
@@ -939,7 +941,7 @@ sub quotation {
     map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
                                                      $form->{"${_}_${i}"})
             if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
+        qw(ship qty sellprice listprice basefactor discount));
   }
 
   &prepare_order;
@@ -1073,9 +1075,7 @@ sub print_options {
     ($form->{type} =~ /_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
-    ) : undef,
-    ($form->{type} eq 'credit_note') ?
-      opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef;
+    ) : undef;
 
   push @SENDMODE,
     opthash("attachment",            $form->{SM}{attachment},          $locale->text('Attachment')),
@@ -1387,7 +1387,7 @@ sub print_form {
     $form->get_shipto(\%myconfig);
   }
 
-  @a = qw(name street zipcode city country);
+  @a = qw(name street zipcode city country contact);
 
   $shipto = 1;
 
@@ -1479,7 +1479,7 @@ sub print_form {
     reformat_numbers($output_numberformat, $precision, @{ $field_list });
   }
 
-  my $extension = '';
+  my $extension = 'html';
   if ($form->{format} eq 'postscript') {
     $form->{postscript}   = 1;
     $extension            = 'tex';