X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c3ab47e282c2f6307aff9506406f309b999e675a;hb=a14368a23b433e316abe5a1bc00e30a516b7a37e;hp=6b4cad7a6f5ebca10f72d04802fb0a4f17823f28;hpb=b8b6cdf3aa11e1dd23b55493f9357585e2b06547;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 6b4cad7a6..c3ab47e28 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -345,7 +345,7 @@ sub display_row {
     if ($form->{"id_${i}"} && !$is_delivery_order) {
       my $price_source  = SL::PriceSource->new(record_item => $record_item, record => $record);
       my $price         = $price_source->price_from_source($::form->{"active_price_source_$i"});
-      my $discount      = $price_source->price_from_source($::form->{"active_discount_source_$i"});
+      my $discount      = $price_source->discount_from_source($::form->{"active_discount_source_$i"});
       my $best_price    = $price_source->best_price;
       my $best_discount = $price_source->best_discount;
       $column_data{price_source} .= $cgi->button(-value => $price->source_description, -onClick => "kivi.io.price_chooser($i)");
@@ -353,8 +353,8 @@ sub display_row {
         $column_data{price_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $price->invalid, title => $price->invalid }) if $price->invalid;
         $column_data{price_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $price->missing, title => $price->missing }) if $price->missing;
         if (!$price->missing && !$price->invalid) {
-          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png',   alt => t8('This price has since gone up'),      title => t8('This price has since gone up' )     }) if $price->price > $record_item->sellprice;
-          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This price has since gone down'),    title => t8('This price has since gone down')    }) if $price->price < $record_item->sellprice;
+          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png',   alt => t8('This price has since gone up'),      title => t8('This price has since gone up' )     }) if $price->price - $record_item->sellprice > 0.01;
+          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This price has since gone down'),    title => t8('This price has since gone down')    }) if $price->price - $record_item->sellprice < -0.01;
           $column_data{price_source} .= ' ' . $cgi->img({src => 'image/ok.png',   alt => t8('There is a better price available'), title => t8('There is a better price available') }) if $best_price && $price->source ne $price_source->best_price->source;
         }
       }
@@ -362,8 +362,8 @@ sub display_row {
         $column_data{discount_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $discount->invalid, title => $discount->invalid }) if $discount->invalid;
         $column_data{discount_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $discount->missing, title => $discount->missing }) if $discount->missing;
         if (!$discount->missing && !$discount->invalid) {
-          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png',   alt => t8('This discount has since gone up'),      title => t8('This discount has since gone up')      }) if $discount->discount * 100 > $record_item->discount;
-          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This discount has since gone down'),    title => t8('This discount has since gone down')    }) if $discount->discount * 100 < $record_item->discount;
+          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png',   alt => t8('This discount has since gone up'),      title => t8('This discount has since gone up')      }) if $discount->discount * 100 - $record_item->discount > 0.01;
+          $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This discount has since gone down'),    title => t8('This discount has since gone down')    }) if $discount->discount * 100 - $record_item->discount < -0.01;
           $column_data{price_source} .= ' ' . $cgi->img({src => 'image/ok.png',   alt => t8('There is a better discount available'), title => t8('There is a better discount available') }) if $best_discount && $discount->source ne $price_source->best_discount->source;
         }
       }
@@ -503,11 +503,14 @@ sub select_item {
   _check_io_auth();
 
   my $previous_form = $::auth->save_form_in_session(form => $::form);
-  $::form->{title}  = $::locale->text('Select from one of the items below');
+  $::form->{title}  = $::myconfig{item_multiselect} ?
+      $::locale->text('Set count for one or more of the items to select them'):
+      $::locale->text('Select from one of the items below');
   $::form->header;
 
   my @item_list = map {
-    $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor});
+    # maybe there is a better backend function or way to calc
+    $_->{display_sellprice} = ($_->{price_factor}) ? $_->{sellprice} / $_->{price_factor} : $_->{sellprice};
     $_;
   } @{ $::form->{item_list} };
 
@@ -1082,144 +1085,32 @@ sub send_email {
   $main::lxdebug->leave_sub();
 }
 
-# generate the printing options displayed at the bottom of oe and is forms.
-# this function will attempt to guess what type of form is displayed, and will generate according options
-#
-# about the coding:
-# this version builds the arrays of options pretty directly. if you have trouble understanding how,
-# the opthash function builds hashrefs which are then pieced together for the template arrays.
-# unneeded options are "undef"ed out, and then grepped out.
-#
-# the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
-  $main::lxdebug->enter_sub();
+  $::lxdebug->enter_sub();
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
+  my (%options) = @_;
 
   _check_io_auth();
 
-  my %options = @_;
-
-  # names 3 parameters and returns a hashref, for use in templates
-  sub opthash { +{ value => shift, selected => shift, oname => shift } }
-  my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
-
-  # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
-  $form->{sendmode}   = "attachment";
-  $form->{format}     = $form->{format} || $myconfig{template_format} || "pdf";
-  $form->{copies}     = $form->{copies} || $myconfig{copies}          || 3;
-  $form->{media}      = $form->{media}  || $myconfig{default_media}   || "screen";
-  $form->{printer_id} = defined $form->{printer_id}           ? $form->{printer_id} :
-                        defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : "";
-
-  $form->{PD}{ $form->{formname} } = "selected";
-  $form->{DF}{ $form->{format} }   = "selected";
-  $form->{OP}{ $form->{media} }    = "selected";
-  $form->{SM}{ $form->{formname} } = "selected";
-
-  push @FORMNAME, grep $_,
-    ($form->{type} eq 'purchase_order') ? (
-      opthash("purchase_order",      $form->{PD}{purchase_order},      $locale->text('Purchase Order')),
-      opthash("bin_list",            $form->{PD}{bin_list},            $locale->text('Bin List'))
-    ) : undef,
-    ($form->{type} eq 'credit_note') ?
-      opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef,
-    ($form->{type} eq 'sales_order') ? (
-      opthash("sales_order",         $form->{PD}{sales_order},         $locale->text('Confirmation')),
-      opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
-    ) : undef,
-    ($form->{type} =~ /sales_quotation$/) ?
-      opthash('sales_quotation',     $form->{PD}{sales_quotation},     $locale->text('Quotation')) : undef,
-    ($form->{type} =~ /request_quotation$/) ?
-      opthash('request_quotation',   $form->{PD}{request_quotation},   $locale->text('Request for Quotation')) : undef,
-    ($form->{type} eq 'invoice') ? (
-      opthash("invoice",             $form->{PD}{invoice},             $locale->text('Invoice')),
-      opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
-    ) : undef,
-    ($form->{type} eq 'invoice' && $form->{storno}) ? (
-      opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
-    ) : undef,
-    ($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;
-
-  push @SENDMODE,
-    opthash("attachment",            $form->{SM}{attachment},          $locale->text('Attachment')),
-    opthash("inline",                $form->{SM}{inline},              $locale->text('In-line'))
-      if ($form->{media} eq 'email');
-
-  my $printable_templates = any { $::lx_office_conf{print_templates}->{$_} } qw(latex opendocument);
-  push @MEDIA, grep $_,
-      opthash("screen",              $form->{OP}{screen},              $locale->text('Screen')),
-    ($printable_templates && $form->{printers} && scalar @{ $form->{printers} }) ?
-      opthash("printer",             $form->{OP}{printer},             $locale->text('Printer')) : undef,
-    ($printable_templates && !$options{no_queue}) ?
-      opthash("queue",               $form->{OP}{queue},               $locale->text('Queue')) : undef
-        if ($form->{media} ne 'email');
-
-  push @FORMAT, grep $_,
-    ($::lx_office_conf{print_templates}->{opendocument} &&     $::lx_office_conf{applications}->{openofficeorg_writer}  &&     $::lx_office_conf{applications}->{xvfb}
-                                                        && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
-     && !$options{no_opendocument_pdf}) ?
-      opthash("opendocument_pdf",    $form->{DF}{"opendocument_pdf"},  $locale->text("PDF (OpenDocument/OASIS)")) : undef,
-    ($::lx_office_conf{print_templates}->{latex}) ?
-      opthash("pdf",                 $form->{DF}{pdf},                 $locale->text('PDF')) : undef,
-    ($::lx_office_conf{print_templates}->{latex} && !$options{no_postscript}) ?
-      opthash("postscript",          $form->{DF}{postscript},          $locale->text('Postscript')) : undef,
-    (!$options{no_html}) ?
-      opthash("html", $form->{DF}{html}, "HTML") : undef,
-    ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
-      opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef,
-    ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
-      opthash("excel",               $form->{DF}{excel},               $locale->text("Excel")) : undef;
-
-  push @LANGUAGE_ID,
-    map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
-      if (ref $form->{languages} eq 'ARRAY');
-
-  push @PRINTER_ID,
-    map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
-      if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
-
-  @SELECTS = map {
-    sname => $_->[1],
-    DATA  => $_->[0],
-    show  => !$options{"hide_" . $_->[1]} && scalar @{ $_->[0] }
-  },
-  [ \@FORMNAME,    'formname',    ],
-  [ \@LANGUAGE_ID, 'language_id', ],
-  [ \@FORMAT,      'format',      ],
-  [ \@SENDMODE,    'sendmode',    ],
-  [ \@MEDIA,       'media',       ],
-  [ \@PRINTER_ID,  'printer_id',  ];
-
-  my %dont_display_groupitems = (
-    'dunning' => 1,
-    );
-
-  my %template_vars = (
-    display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
-    display_remove_draft => (!$form->{id} && $form->{draft_id}),
-    display_groupitems   => !$dont_display_groupitems{$form->{type}},
-    groupitems_checked   => $form->{groupitems} ? "checked" : '',
-    remove_draft_checked => $form->{remove_draft} ? "checked" : ''
-  );
+  my $inline = delete $options{inline};
 
-  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
+  require SL::Helper::PrintOptions;
+  my $print_options = SL::Helper::PrintOptions->get_print_options(
+    form     => $::form,
+    myconfig => \%::myconfig,
+    locale   => $::locale,
+    options  => \%options);
 
-  if ($options{inline}) {
-    $main::lxdebug->leave_sub();
+  if ($inline) {
+    $::lxdebug->leave_sub();
     return $print_options;
   }
 
   print $print_options;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub();
 }
 
+
 sub print {
   $main::lxdebug->enter_sub();
 
@@ -1494,11 +1385,13 @@ sub print_form {
   format_dates($output_dateformat, $output_longdates,
                qw(invdate orddate quodate pldate duedate reqdate transdate
                   shippingdate deliverydate validitydate paymentdate
-                  datepaid transdate_oe deliverydate_oe dodate
+                  datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate
                   employee_startdate employee_enddate
                   ),
                grep({ /^datepaid_\d+$/ ||
                         /^transdate_oe_\d+$/ ||
+                        /^transdate_do_\d+$/ ||
+                        /^transdate_quo_\d+$/ ||
                         /^deliverydate_oe_\d+$/ ||
                         /^reqdate_\d+$/ ||
                         /^deliverydate_\d+$/ ||
@@ -1752,11 +1645,10 @@ sub ship_to {
   map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining);
 
   # get details for customer/vendor
-  call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number");
-
+  call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country gln contact email phone fax), $::form->{vc} . "number");
   $::form->{rowcount}--;
 
-  my @shipto_vars   = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+  my @shipto_vars   = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln
                          shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
                          shiptodepartment_1 shiptodepartment_2);
   my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]);
@@ -2041,15 +1933,18 @@ sub _make_record_item {
           : $class->new;
 
   for my $method (apply { s/_$row$// } grep { /_$row$/ } keys %$::form) {
-    next unless $obj->meta->column($method);
-    if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
-      $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
-    } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
-      $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
-    } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
-      $obj->$method(!!$::form->{$method});
+    if ($obj->meta->column($method)) {
+      if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
+        $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
+      } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
+        $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
+      } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
+        $obj->$method(!!$::form->{$method});
+      } else {
+        $obj->$method($::form->{"$method\_$row"});
+      }
     } else {
-      $obj->$method($::form->{"$method\_$row"});
+      $obj->{__additional_form_attributes}{$method} = $::form->{"$method\_$row"};
     }
   }