QS Bernd/Sven: Weniger Code und klarer

zu: c22e188b4d7aabd
und: 8453789b

diff --git a/SL/Helper/ShippedQty.pm b/SL/Helper/ShippedQty.pm
index 0157c2276180482a5984d5f59f9c24faee529310..dbdb1c79886b193677029a05422291b47842bac9 100644 (file)
--- a/SL/Helper/ShippedQty.pm
+++ b/SL/Helper/ShippedQty.pm
@@ -221,7 +221,7 @@ sub write_to {
     } elsif ('SL::DB::Order' eq ref $obj) {
       if (defined $obj->{orderitems}) {
         $self->write_to($obj->{orderitems});
     } elsif ('SL::DB::Order' eq ref $obj) {
       if (defined $obj->{orderitems}) {
         $self->write_to($obj->{orderitems});

-        $obj->{delivered} = all { $_->{delivered} } grep { !$_->{optional} || $_->{optional} == 0 } @{ $obj->{orderitems} };
+        $obj->{delivered} = all { $_->{delivered} } grep { !$_->{optional} } @{ $obj->{orderitems} };

       } else {
         # don't force a load on items. just compute by oe_id directly
         $obj->{delivered} = $self->delivered->{$obj->id};
       } else {
         # don't force a load on items. just compute by oe_id directly
         $obj->{delivered} = $self->delivered->{$obj->id};

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 4f55310aa987a249958cb08a9462b9411fa52b91..576f8aa29b2e2d46ce61d8b11253ad67fbb9e816 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -245,8 +245,7 @@ sub setup_do_action_bar {
   my $insertdate = DateTime->from_kivitendo($::form->{insertdate});
   my $undo_transfer  = 0;
   if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') {
   my $insertdate = DateTime->from_kivitendo($::form->{insertdate});
   my $undo_transfer  = 0;
   if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') {

-    # DateTime->compare      it returns 1 if $dt1 > $dt2
-    $undo_transfer = DateTime->compare($insertdate, $undo_date) == 1 ? 1 : 0;
+    $undo_transfer = $insertdate > $undo_date;

   }
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
   }
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 06d5f8b2325136c187d1e471b05dce0a2c3fbfbe..980cddb2ec097697e56d4f7e397d64c111172d8b 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -753,9 +753,8 @@ sub generate_journal {
 
     if ($entry->{assembled}) {
       my $insertdate = DateTime->from_kivitendo($entry->{shippingdate});
 
     if ($entry->{assembled}) {
       my $insertdate = DateTime->from_kivitendo($entry->{shippingdate});

-      if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') {
-        my $undo_assembly = DateTime->compare($insertdate, $undo_date) == 1 ? 1 : 0;
-        $row->{ids}->{raw_data} = checkbox_tag("ids[]", value => $entry->{trans_id}, "data-checkall" => 1) if $undo_assembly;
+      if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime' && $insertdate > $undo_date) {
+        $row->{ids}->{raw_data} = checkbox_tag("ids[]", value => $entry->{trans_id}, "data-checkall" => 1);

       }
     }
     $row->{trans_type}->{raw_data} = $entry->{trans_type};
       }
     }
     $row->{trans_type}->{raw_data} = $entry->{trans_type};