X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=26ebde50b08d83e319a6c9b1eaa3f14f4babdf81;hb=6cbeab9a2d7691fa8fb69faab3f21a662df8740f;hp=2eee9ed96fac8030565d561df4ba8b61e6066b7d;hpb=137c9df38763ec61f4d459f798a69b47db7dd009;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 2eee9ed96..26ebde50b 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -156,7 +156,8 @@ sub order_links { my $editing = $form->{id}; - DO->retrieve(); + DO->retrieve('vc' => $form->{vc}, + 'ids' => $form->{id}); $payment_id = $form->{payment_id} if ($form->{payment_id}); $language_id = $form->{language_id} if ($form->{language_id}); @@ -382,7 +383,7 @@ sub search { check_do_access(); - $form->{vc} = $form->{type} eq 'purchase_order' ? 'vendor' : 'customer'; + $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer'; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, @@ -415,7 +416,7 @@ sub orders { $form->{rowcount} = scalar @{ $form->{DO} }; my @columns = qw( - transdate + ids transdate id donumber ordnumber name employee @@ -460,7 +461,8 @@ sub orders { $form->{"l_type"} = "Y"; map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns; - $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0; + + $column_defs{ids}->{visible} = 'HTML'; $report->set_columns(%column_defs); $report->set_column_order(@columns); @@ -508,10 +510,12 @@ sub orders { push @options, $locale->text('Not delivered'); } - $report->set_options('top_info_text' => join("\n", @options), - 'output_format' => 'HTML', - 'title' => $form->{title}, - 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + $report->set_options('top_info_text' => join("\n", @options), + 'raw_top_info_text' => $form->parse_html_template('do/orders_top'), + 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom'), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), ); $report->set_options_from_form(); @@ -524,16 +528,27 @@ sub orders { my $edit_url = build_std_url('action=edit', 'type', 'vc'); my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit'); + my $idx = 1; + foreach $dord (@{ $form->{DO} }) { $dord->{open} = $dord->{closed} ? $locale->text('No') : $locale->text('Yes'); $dord->{delivered} = $dord->{delivered} ? $locale->text('Yes') : $locale->text('No'); my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns }; + $row->{ids} = { + 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $dord->{id}) + . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''), + 'valign' => 'center', + 'align' => 'center', + }; + $row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}"; $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}"; $report->add_data($row); + + $idx++; } $report->generate_with_headers(); @@ -631,7 +646,7 @@ sub invoice { $lxdebug->enter_sub(); check_do_access(); - $auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit'); + $auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit'); $form->{deliverydate} = $form->{transdate}; $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig); @@ -704,6 +719,69 @@ sub invoice { $lxdebug->leave_sub(); } +sub invoice_multi { + $lxdebug->enter_sub(); + + check_do_access(); + $auth->assert($form->{type} eq 'sales_delivery_order' ? 'invoice_edit' : 'vendor_invoice_edit'); + + my @do_ids = map { $form->{"trans_id_$_"} } grep { $form->{"multi_id_$_"} } (1..$form->{rowcount}); + + if (!scalar @do_ids) { + $form->show_generic_error($locale->text('You have not selected any delivery order.'), 'back_button' => 1); + } + + map { delete $form->{$_} } grep { m/^(?:trans|multi)_id_\d+/ } keys %{ $form }; + + if (!DO->retrieve('vc' => $form->{vc}, 'ids' => \@do_ids)) { + $form->show_generic_error($form->{vc} eq 'customer' ? + $locale->text('You cannot create an invoice for delivery orders for different customers.') : + $locale->text('You cannot create an invoice for delivery orders from different vendors.'), + 'back_button' => 1); + } + + $form->{deliverydate} = $form->{transdate}; + $form->{transdate} = $form->current_date(\%myconfig); + $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1); + $form->{type} = "invoice"; + $form->{closed} = 0; + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + + my $buysell; + if ($form->{type} eq 'purchase_delivery_order') { + $form->{title} = $locale->text('Add Vendor Invoice'); + $form->{script} = 'ir.pl'; + $script = "ir"; + $buysell = 'sell'; + + } else { + $form->{title} = $locale->text('Add Sales Invoice'); + $form->{script} = 'is.pl'; + $script = "is"; + $buysell = 'buy'; + } + + map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued); + + $form->{rowcount} = 0; + foreach my $ref (@{ $form->{form_details} }) { + $form->{rowcount}++; + map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref }; + map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost); + } + delete $form->{form_details}; + + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + + invoice_links(); + prepare_invoice(); + display_form(); + + $lxdebug->leave_sub(); +} + sub save_as_new { $lxdebug->enter_sub(); @@ -827,9 +905,9 @@ sub update_stock_in { my $stock_info = []; foreach my $i (1..$form->{rowcount}) { + $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"}); push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) }; } - $main::lxdebug->dump(0, "si", $stock_info); display_stock_in_form($stock_info); @@ -855,14 +933,11 @@ sub display_stock_in_form { my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); - my $units = AM->retrieve_units(\%myconfig, $form, "dimension"); + my $units = AM->retrieve_units(\%myconfig, $form); my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit}); - my $access = $auth->check_right($form->{login}, 'all_warehouses') ? undef : $form->{login}; - $form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', - 'bins' => 'BINS', - 'access' => $access, }); + 'bins' => 'BINS' }); redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed}); @@ -904,7 +979,7 @@ sub stock_out_form { my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); - my $units = AM->retrieve_units(\%myconfig, $form, "dimension"); + my $units = AM->retrieve_units(\%myconfig, $form); my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit}); my @contents = DO->get_item_availability('parts_id' => $form->{parts_id}); @@ -988,7 +1063,7 @@ sub transfer_in_and_close { my @all_requests; if (@part_ids) { - my $units = AM->retrieve_units(\%myconfig, $form, "dimension"); + my $units = AM->retrieve_units(\%myconfig, $form); my %part_info_map = IC->get_basic_part_info('id' => \@part_ids); my %request_map; @@ -1045,7 +1120,7 @@ sub transfer_out_and_close { my @all_requests; if (@part_ids) { - my $units = AM->retrieve_units(\%myconfig, $form, "dimension"); + my $units = AM->retrieve_units(\%myconfig, $form); my %part_info_map = IC->get_basic_part_info('id' => \@part_ids); my %request_map;