X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=b6eaf9ca12047fcb476b3ff2b32e369c3bc19375;hb=c184bce36ecd18049541dccaaa38d212fb6170cf;hp=3700ec60ecf14aaefa4e0296674e6d28c1083c8d;hpb=6ac037ceaeb565f385267b2f8794e28e7ce50af8;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 3700ec60e..b6eaf9ca1 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -144,8 +144,8 @@ 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 => 'discount',      width => 5,     value => $locale->text('Discount'),             display => ($form->{vc} eq 'customer') && !$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, },
     {  id => 'stock_in_out',  width => 10,    value => $stock_in_out_title,                   display => $is_delivery_order, },
@@ -290,11 +290,6 @@ sub display_row {
     $column_data{bin}         = $form->{"bin_$i"};
 
     if ($is_delivery_order) {
-      # $column_data{stock_in_out} =  $form->{"inventory_accno_$i"} ? calculate_stock_in_out($i) : ' ';
-      # $main::lxdebug->dump(0, "debug", $form->{"inventory_accno_$i"});
-      # meine debug-analyse war negativ (s.o.) - die variable war weder bei dienstleistung, erzeugnis noch ware gefüllt.
-      # bitte korrigieren, falls ich hier falsch liege. jb 19.3.2009
-
       $column_data{stock_in_out} =  calculate_stock_in_out($i);
     }
 
@@ -684,7 +679,7 @@ sub check_form {
                 not_discountable shop ve gv buchungsgruppen_id language_values
                 sellprice_pg pricegroup_old price_old price_new unit_old ordnumber
                 transdate longdescription basefactor marge_total marge_percent
-                marge_price_factor lastcost price_factor_id
+                marge_price_factor lastcost price_factor_id partnotes
                 stock_out stock_in);
 
   # remove any makes or model rows
@@ -694,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"}) {
@@ -713,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});
@@ -888,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;
@@ -944,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;
@@ -1078,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')),
@@ -1392,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;