X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=cdf43d3392afd4db84f34f5bb4c0794a0fc5a6e0;hb=879496271a8c6004a12c49d0f057ff20db0607f3;hp=26fb98e3e041ad54db287ea629cb2b1cd54aa09c;hpb=a648b673fcb23982d6fecb0c0f97a40c0636a601;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 26fb98e3e..cdf43d339 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -57,7 +57,7 @@ use SL::DB::Language;
 use SL::DB::Printer;
 use SL::DB::Vendor;
 use SL::Helper::CreatePDF;
-use SL::Helper::Flash;
+use SL::Helper::Flash qw(flash);
 
 require "bin/mozilla/common.pl";
 
@@ -319,7 +319,8 @@ sub display_row {
       $ship_qty          *= $all_units->{$form->{"partunit_$i"}}->{factor};
       $ship_qty          /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
 
-      $column_data{ship}  = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
+      $column_data{ship}  = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}
+      . $cgi->hidden(-name => "ship_$i", -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}, $qty_dec));
 
       my $ship_missing_qty    = $form->{"qty_$i"} - $ship_qty;
       my $ship_missing_amount = $form->round_amount($ship_missing_qty * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
@@ -503,7 +504,9 @@ 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 {
@@ -1056,6 +1059,7 @@ sub edit_e_mail {
                                      a_filename    => $attachment_filename,
                                      subject       => $subject,
                                      print_options => print_options('inline' => 1),
+                                     action        => 'send_email',
                                      HIDDEN        => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
                                      SHOW_BCC      => $::auth->assert('email_bcc', 'may fail') });
 
@@ -1083,145 +1087,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,
-    'letter'  => 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();
 
@@ -1356,6 +1247,17 @@ sub print_form {
     $order                = 1;
   }
 
+  if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'ic_supply') ) {
+    $inv                  = "inv";
+    $due                  = "due";
+    $form->{"${inv}date"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
+    $form->{invnumber}    = $form->{ordnumber};
+    $form->{label}        = $locale->text('Intra-Community supply');
+    $numberfld            = "sonumber";
+    $order                = 1;
+  }
+
   if ($form->{formname} eq 'request_quotation') {
     $inv                  = "quo";
     $due                  = "req";
@@ -1756,22 +1658,25 @@ 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 $cvars         = SL::DB::Shipto->new->cvars_by_config;
+  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) ]);
+  my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id), map { "shiptocvar_" . $_->config->name } @{ $cvars } ]);
   $::form->{title}  = $::locale->text('Ship to');
   $::form->header;
 
   my $vc_obj = ($::form->{vc} eq 'customer' ? "SL::DB::Customer" : "SL::DB::Vendor")->new(id => $::form->{$::form->{vc} . "_id"})->load;
 
+  $_->value($::form->{"shiptocvar_" . $_->config->name}) for @{ $cvars };
+
   print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
                                                      nextsub      => $::form->{display_form} || 'display_form',
                                                      vc_obj       => $vc_obj,
+                                                     cvars        => $cvars,
                                                    });
 
   $main::lxdebug->leave_sub();
@@ -1867,36 +1772,21 @@ sub _update_ship {
 
   my $all_units = AM->retrieve_all_units();
 
-  my %ship = DO->get_shipped_qty('type'  => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
-                                 'oe_id' => $form->{id},);
+  my %ship = DO->get_shipped_qty('oe_id' => $form->{id});
 
   foreach my $i (1..$form->{rowcount}) {
     next unless ($form->{"id_${i}"});
 
     $form->{"ship_$i"} = 0;
 
-    my $ship_entry = $ship{$form->{"id_$i"}};
-
-    next if (!$ship_entry || ($ship_entry->{qty} <= 0));
-
-    my $rowqty =
-      ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
-      * $all_units->{$form->{"unit_$i"}}->{factor}
-      / $all_units->{$form->{"partunit_$i"}}->{factor};
-
-    $form->{"ship_$i"}  = min($rowqty, $ship_entry->{qty});
-    $ship_entry->{qty} -= $form->{"ship_$i"};
-  }
-
-  foreach my $i (1..$form->{rowcount}) {
-    next unless ($form->{"id_${i}"});
-
-    my $ship_entry = $ship{$form->{"id_$i"}};
+    my $ship_entry = $ship{$i};
 
-    next if (!$ship_entry || ($ship_entry->{qty} <= 0.01));
+    next if (!$ship_entry || ($ship_entry->{qty_ordered} <= 0));
 
-    $form->{"ship_$i"} += $ship_entry->{qty};
-    $ship_entry->{qty}  = 0;
+    my $rowqty = $ship_entry->{qty_ordered} - $ship_entry->{qty_notdelivered};
+    $rowqty   *= $all_units->{$form->{"unit_$i"}}->{factor} /
+                 $all_units->{$form->{"partunit_$i"}}->{factor} if !$form->{simple_save};
+    $form->{"ship_$i"}  = $rowqty;
   }
 
   $main::lxdebug->leave_sub();