X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=86813c941a3b76fc4eb0b4e34dc82768d1a5f2af;hb=76466336f47eb3be6b76d1fd17d5b9475c975810;hp=ff28f9a4a634f3de968299da4d88da91f6330222;hpb=c1ec3f4f93af94698c2d017329ed8286a7c3cc0b;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index ff28f9a4a..86813c941 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -28,7 +28,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. # ####################################################################### # @@ -49,6 +50,7 @@ use SL::CT; use SL::Locale::String qw(t8); use SL::IC; use SL::IO; +use SL::File; use SL::PriceSource; use SL::DB::Customer; @@ -103,7 +105,6 @@ if (-f "bin/mozilla/$::myconfig{login}_io.pl") { # $locale->text('Nov') # $locale->text('Dec') use SL::IS; -use SL::PE; use SL::AM; use Data::Dumper; @@ -159,7 +160,7 @@ sub display_row { # column_index my @header_sort = qw( - runningnumber partnumber description ship ship_missing qty price_factor + runningnumber partnumber type_and_classific description ship ship_missing qty price_factor unit weight price_source sellprice discount linetotal bin stock_in_out ); @@ -169,6 +170,8 @@ sub display_row { my %column_def = ( runningnumber => { width => 5, value => $locale->text('No.'), display => 1, }, partnumber => { width => 8, value => $locale->text('Number'), display => 1, }, + type_and_classific + => { width => 2, value => $locale->text('Type'), display => 1, }, description => { width => 30, value => $locale->text('Part Description'), display => 1, }, ship => { width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, }, ship_missing => { width => 5, value => $locale->text('Not delivered'), display => $show_ship_missing, }, @@ -295,12 +298,14 @@ sub display_row { my $rows = $form->numtextrows($form->{"description_$i"}, 30, 6); # quick delete single row - $column_data{runningnumber} .= q|| . + $column_data{runningnumber} = q|| . q|| . $locale->text('Remove') . q| |; $column_data{runningnumber} .= $cgi->textfield(-name => "runningnumber_$i", -id => "runningnumber_$i", -size => 5, -value => $i); # HuT $column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -id => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"}); + $column_data{type_and_classific} = $::request->presenter->type_abbreviation($form->{"part_type_$i"}). + $::request->presenter->classification_abbreviation($form->{"classification_id_$i"}) if $form->{"id_$i"}; $column_data{description} = (($rows > 1) # if description is too large, use a textbox instead ? $cgi->textarea( -name => "description_$i", -id => "description_$i", -default => $form->{"description_$i"}, -rows => $rows, -columns => 30) : $cgi->textfield(-name => "description_$i", -id => "description_$i", -value => $form->{"description_$i"}, -size => 30)) @@ -319,7 +324,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); @@ -345,7 +351,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 +359,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 +368,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; } } @@ -380,7 +386,7 @@ sub display_row { '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"} )); - $column_data{reqdate} = qq||; + $column_data{reqdate} = qq||; $column_data{subtotal} = sprintf qq||, $form->{"subtotal_$i"} ? 'checked' : ''; # begin marge calculations @@ -487,7 +493,7 @@ sub display_row { HEADER => \@HEADER, }); - if (0 != ($form->{sellprice_total} * 1)) { + if (abs($form->{sellprice_total} * 1) >= 0.01) { $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100; } @@ -503,11 +509,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} }; @@ -600,7 +609,7 @@ sub item_selected { my @new_fields = qw(id partnumber description sellprice listprice inventory_accno - income_accno expense_accno bin unit weight assembly taxaccounts + income_accno expense_accno bin unit weight part_type taxaccounts partsgroup formel longdescription not_discountable partnotes lastcost price_factor_id price_factor); @@ -661,15 +670,14 @@ sub item_selected { map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded}; $form->{creditremaining} -= $amount; - $form->{"runningnumber_$i"} = $i; # format amounts map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) - } qw(sellprice lastcost qty) if $form->{item} ne 'assembly'; - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{item} ne 'assembly'; + } qw(sellprice lastcost qty) if $form->{part_type} ne 'assembly'; + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{part_type} ne 'assembly'; delete $form->{nextsub}; @@ -723,7 +731,7 @@ sub check_form { my $count = 0; # remove any makes or model rows - if ($form->{item} eq 'assembly') { + if ($form->{part_type} eq 'assembly') { # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt? #$form->{sellprice} = 0; @@ -756,7 +764,7 @@ sub check_form { $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows}); $form->{assembly_rows} = $count; - } elsif ($form->{item} !~ m{^(?:part|service)$}) { + } elsif ($form->{part_type} !~ m{^(?:part|service)$}) { remove_emptied_rows(1); $form->{creditremaining} -= &invoicetotal; @@ -856,7 +864,7 @@ sub validate_items { if ($form->{rowcount} == 1) { flash('warning', $::locale->text('The action you\'ve chosen has not been executed because the document does not contain any item yet.')); &update; - ::end_of_request(); + $::dispatcher->end_request; } for my $i (1 .. $form->{rowcount} - 1) { @@ -884,10 +892,22 @@ sub order { $form->{old_employee_id} = $form->{employee_id}; $form->{old_salesman_id} = $form->{salesman_id}; - # link doc invoice -> quotation (single id no multi mode) - $form->{convert_from_ar_ids} = delete $form->{id}; - delete $form->{$_} foreach (qw(printed emailed queued)); + + # When creating a new sales order from a saved sales invoice, reset id, + # ordnumber, transdate and deliverydate as we are creating a new order. This + # workflow is probably mainly used as a template mechanism for creating new + # orders from existing invoices, so we probably don't want to link the items. + # Is this order function called anywhere else? + # The worksflows in oe already call sales_order and purchase_order in oe, not + # this general function which now only seems to be called from saved sales + # invoices + # Why is ordnumber set to invnumber above, does this ever make sense? + + if ( $form->{script} eq 'is.pl' && $form->{type} eq 'invoice' ) { + delete $form->{$_} foreach (qw(ordnumber id transdate deliverydate)); + }; + my $buysell; if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Add Purchase Order'); @@ -950,9 +970,6 @@ sub quotation { if ($form->{type} =~ /(sales|purchase)_order/) { $form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"}; } - # link doc order -> quotation (single id no multi mode) - $form->{convert_from_oe_ids} = delete $form->{id}; - if ($form->{second_run}) { $form->{print_and_post} = 0; } @@ -1050,11 +1067,38 @@ sub edit_e_mail { @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; + my (@files, @vc_files, @part_files, $has_document); + + if ($::instance_conf->get_doc_storage) { + @files = SL::File->get_all_versions(object_id => $form->{id}, object_type => $form->{type}, file_type => 'document'); + $has_document = 1 if scalar(@files) > 0; + @files = SL::File->get_all(object_id => $form->{id}, object_type => $form->{type}, file_type => 'attachment'); + @vc_files = SL::File->get_all(object_id => $form->{"$form->{vc}_id"}, object_type => $form->{vc}) + if $form->{vc} && $form->{"$form->{vc}_id"}; + + my %part_id_map = map { $_->{id} => $_ } grep { $_->{id} } map { + { + 'id' => $form->{"id_$_"}, + 'partname' => $form->{"partnumber_$_"} + } + } (1 .. $form->{rowcount}); + + foreach my $partid (keys %part_id_map) { + my @pfiles = SL::File->get_all(object_id => $partid, object_type => 'part'); + push @part_files, map { $_->{partname} = $part_id_map{$partid}->{partname}; $_ } @pfiles; + } + } + print $form->parse_html_template('generic/edit_email', { title => $title, a_filename => $attachment_filename, subject => $subject, + has_document => $has_document, print_options => print_options('inline' => 1), + action => 'send_email', + FILES => \@files, + VC_FILES => \@vc_files, + PART_FILES => \@part_files, HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], SHOW_BCC => $::auth->assert('email_bcc', 'may fail') }); @@ -1071,10 +1115,28 @@ sub send_email { my $callback = $form->{script} . "?action=edit"; map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id)); + if ( $form->{action_oldfile} || $form->{action_nofile} ) { + if (!$form->{email} || $form->{email} =~ /^\s*$/) { + flash('error', $::locale->text('E-mail address missing!')); + } + else { + $form->send_email(\%myconfig,'pdf'); + } + } + else { + print_form("return"); + $form->{addition} = "SCREENED"; + $form->save_history; + $form->{addition} = "MAILED"; + } + + flash_later('info' , $::locale->text('E-Mail is sent to #1', $form->{email})) if !$form->{emailerr}; + flash_later('error', $::locale->text($form->{emailerr})) if $form->{emailerr}; - print_form("return"); + delete $form->{emailerr}; Common->save_email_status(\%myconfig, $form); + ##TODO andere SAVE HISTORY $form->{callback} = $callback; $form->redirect(); @@ -1082,144 +1144,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 $inline = delete $options{inline}; - 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" : '' - ); + require SL::Helper::PrintOptions; + my $print_options = SL::Helper::PrintOptions->get_print_options( + form => $::form, + myconfig => \%::myconfig, + locale => $::locale, + options => \%options); - my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } ); - - 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(); @@ -1254,7 +1204,7 @@ sub print { $form->{formname} = $formname; &edit(); $::lxdebug->leave_sub(); - ::end_of_request(); + $::dispatcher->end_request; } &print_form($old_form); @@ -1354,6 +1304,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"; @@ -1378,11 +1339,7 @@ sub print_form { $form->{TEMPLATE_DRIVER_OPTIONS} = { }; if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice request_quotation purchase_order purchase_delivery_order credit_note)) { - $form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = { - longdescription => 'html', - partnotes => 'html', - notes => 'html', - }; + $form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types(); } $form->isblank("email", $locale->text('E-mail address missing!')) @@ -1576,6 +1533,7 @@ sub print_form { $form->{emailed} .= " $form->{formname}"; $form->{emailed} =~ s/^ //; + $form->{addition} = "MAILED"; } my $emailed = $form->{emailed}; @@ -1687,7 +1645,7 @@ sub print_form { } call_sub($display_form); - ::end_of_request(); + $::dispatcher->end_request; } my $msg = @@ -1701,7 +1659,7 @@ sub print_form { } if ($form->{printing}) { call_sub($display_form); - ::end_of_request(); + $::dispatcher->end_request; } $main::lxdebug->leave_sub(); @@ -1754,22 +1712,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(); @@ -1843,9 +1804,11 @@ sub _update_part_information { foreach my $i (1..$form->{rowcount}) { next unless ($form->{"id_${i}"}); - my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { }; - $form->{"partunit_${i}"} = $info->{unit}; - $form->{"weight_$i"} = $info->{weight}; + my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { }; + $form->{"partunit_${i}"} = $info->{unit}; + $form->{"weight_$i"} = $info->{weight}; + $form->{"part_type_$i"} = $info->{part_type}; + $form->{"classification_id_$i"} = $info->{classification_id}; } $main::lxdebug->leave_sub(); @@ -1865,36 +1828,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"}}; + my $ship_entry = $ship{$i}; - next if (!$ship_entry || ($ship_entry->{qty} <= 0)); + next if (!$ship_entry || ($ship_entry->{qty_ordered} <= 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"}}; - - next if (!$ship_entry || ($ship_entry->{qty} <= 0.01)); - - $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(); @@ -2043,15 +1991,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"}; } }