X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=b8b169f976dc33951a4b0d8a336eb88f8c0be806;hb=841d44c00aae1166a0721e40dc2f9ffb7b9ac5b5;hp=2079533a151ac4de8cc6e6a9d099ae0516783ed0;hpb=34f5531fd67d118fcdeaf385d4077eabd328f00c;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 2079533a1..b8b169f97 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -40,7 +40,6 @@ use SL::IR; use SL::IS; use SL::ReportGenerator; use SL::WH; - require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/invoice_io.pl"; @@ -174,8 +173,8 @@ sub order_links { DO->retrieve('vc' => $form->{vc}, 'ids' => $form->{id}); - $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes)); - $form->{shipto} = 1 if $form->{id}; + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes currency)); + $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids}; # get customer / vendor if ($form->{vc} eq 'vendor') { @@ -187,6 +186,7 @@ sub order_links { } $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id)); + $form->restore_vars(qw(currency)) if ($form->{id} || $form->{convert_from_oe_ids}); $form->restore_vars(qw(taxincluded)) if $form->{id}; $form->restore_vars(qw(salesman_id)) if $editing; @@ -258,29 +258,37 @@ sub form_header { # use JavaScript Calendar or not $form->{jsscript} = 1; - #write Trigger - my $jsscript = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2"); - my @old_project_ids = ($form->{"globalproject_id"}); map({ push(@old_project_ids, $form->{"project_id_$_"}) if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; - $form->get_lists("contacts" => "ALL_CONTACTS", - "shipto" => "ALL_SHIPTO", - "projects" => { + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 0, "old_id" => \@old_project_ids }, - "employees" => "ALL_EMPLOYEES", - "salesmen" => "ALL_SALESMEN", $vc => "ALL_VC", "price_factors" => "ALL_PRICE_FACTORS", "departments" => "ALL_DEPARTMENTS", "business_types" => "ALL_BUSINESS_TYPES", ); + $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]); + $::form->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]); + $::form->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all(query => [ + or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ] + ]); + $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all(query => [ + or => [ + cp_cv_id => $::form->{"$::form->{vc}_id"} * 1, + and => [ + cp_cv_id => undef, + cp_id => $::form->{cp_id} * 1 + ] + ] + ]); + map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} }; map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} }; @@ -289,20 +297,35 @@ sub form_header { $form->{oldvcname} = $form->{"old$form->{vc}"}; $form->{oldvcname} =~ s/--.*//; - $form->{onload} = ""; if ($form->{resubmit}) { + my $dispatch_to_popup = ''; if ($form->{format} eq "html") { - $form->{onload} = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';"; + $dispatch_to_popup .= "window.open('about:blank','Beleg'); document.do.target = 'Beleg';"; } # emulate click for resubmitting actions - $form->{onload} .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form; - $form->{onload} .= "document.do.submit();" + $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form; + $dispatch_to_popup .= "document.do.submit();"; + $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})"); } + my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' }; + $follow_up_vc =~ s/--\d*\s*$//; + + $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')'; + $form->header(); # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID' - $form->{department} .= '--' . $form->{department_id}; - + # und Erweiterung für Bug 1760: + # Das war leider nur ein Teil-Fix, da das Verhalten den 'Erneuern'-Knopf + # nicht überlebt. Konsequent jetzt auf L umgestellt + # $ perldoc SL::Template::Plugin::L + # Daher entsprechend nur die Anpassung in form_header + # und in DO.pm gemacht. 4 Testfälle: + # department_id speichern | i.O. + # department_id lesen | i.O. + # department leer überlebt erneuern | i.O. + # department nicht leer überlebt erneuern | i.O. + # $main::lxdebug->message(0, 'ABTEILUNGS ID in form?' . $form->{department_id}); print $form->parse_html_template('do/form_header'); $main::lxdebug->leave_sub(); @@ -317,7 +340,8 @@ sub form_footer { $form->{PRINT_OPTIONS} = print_options('inline' => 1); - print $form->parse_html_template('do/form_footer'); + print $form->parse_html_template('do/form_footer', + {transfer_default => ($::instance_conf->get_transfer_default)}); $main::lxdebug->leave_sub(); } @@ -431,9 +455,9 @@ sub search { $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "employees" => "ALL_EMPLOYEES", - "salesmen" => "ALL_SALESMEN", + "departments" => "ALL_DEPARTMENTS", "$form->{vc}s" => "ALL_VC"); + $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; $form->{jsscript} = 1; @@ -456,6 +480,7 @@ sub orders { my $locale = $main::locale; my $cgi = $::request->{cgi}; + $form->{department_id} = (split /--/, $form->{department})[-1]; ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} }); report_generator_set_default_sort('transdate', 1); @@ -465,12 +490,12 @@ sub orders { $form->{rowcount} = scalar @{ $form->{DO} }; my @columns = qw( - ids transdate + ids transdate reqdate id donumber - ordnumber - name employee + ordnumber customernumber + name employee salesman shipvia globalprojectnumber - transaction_description + transaction_description department open delivered ); @@ -492,19 +517,23 @@ sub orders { my %column_defs = ( 'ids' => { 'text' => '', }, 'transdate' => { 'text' => $locale->text('Date'), }, + 'reqdate' => { 'text' => $locale->text('Reqdate'), }, 'id' => { 'text' => $locale->text('ID'), }, 'donumber' => { 'text' => $locale->text('Delivery Order'), }, 'ordnumber' => { 'text' => $locale->text('Order'), }, + 'customernumber' => { 'text' => $locale->text('Customer Number'), }, 'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, 'employee' => { 'text' => $locale->text('Employee'), }, + 'salesman' => { 'text' => $locale->text('Salesman'), }, 'shipvia' => { 'text' => $locale->text('Ship via'), }, 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), }, 'transaction_description' => { 'text' => $locale->text('Transaction description'), }, 'open' => { 'text' => $locale->text('Open'), }, 'delivered' => { 'text' => $locale->text('Delivered'), }, + 'department' => { 'text' => $locale->text('Department'), }, ); - foreach my $name (qw(id transdate donumber ordnumber name employee shipvia transaction_description)) { + foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } @@ -595,8 +624,7 @@ sub orders { }; $row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}"; - $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}"; - + $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}" if $dord->{oe_id}; $report->add_data($row); $idx++; @@ -641,17 +669,7 @@ sub save { } $form->{id} = 0 if $form->{saveasnew}; - # best case fix für bug 1079. Einkaufsrabatt wird nicht richtig - # aus Lieferantenauftrag -> Lieferschein -> Rechnung übernommen - # Tritt nur auf, wenn man direkt über Lieferschein -> speichern -> - # Workflow Rechnung geht (beim Aufruf über edit() i.O.) - # Gut. DO-save() speichert den Discount im DB-Format 0.12 für - # 12%, die Konvertierung wird leider in $form gemacht und daher - # wird die Maske mit dem falschen Rabatt wieder aufgebaut. - # Wie immer: backup_vars verwenden um nichts anderes kaputt zu - # machen. jan 03.03.2010 - # nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend - # geändert wurde + DO->save(); # saving the history if(!exists $form->{addition}) { @@ -772,6 +790,7 @@ sub invoice { require "bin/mozilla/$form->{script}"; my $currency = $form->{currency}; + $form->{shipto} = 1 if $form->{convert_from_do_ids}; invoice_links(); if ($form->{ordnumber}) { @@ -820,7 +839,7 @@ sub invoice { # show pricegroup in newly loaded invoice when creating invoice from delivery order for my $i (1 .. $form->{rowcount}) { - $form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"}; + $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"}; } IS->get_pricegroups_for_parts(\%myconfig, \%$form); set_pricegroup($_) for 1 .. $form->{rowcount}; @@ -926,7 +945,7 @@ sub invoice_multi { # show pricegroup in newly loaded invoice when creating invoice from delivery order for my $i (1 .. $form->{rowcount}) { - $form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"}; + $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"}; } IS->get_pricegroups_for_parts(\%myconfig, \%$form); set_pricegroup($_) for 1 .. $form->{rowcount}; @@ -949,7 +968,7 @@ sub save_as_new { map { delete $form->{$_} } qw(printed emailed queued); delete @{ $form }{ grep { m/^stock_(?:in|out)_\d+/ } keys %{ $form } }; - # Let Lx-Office assign a new order number if the user hasn't changed the + # Let kivitendo assign a new order number if the user hasn't changed the # previous one. If it has been changed manually then use it as-is. $form->{donumber} =~ s/^\s*//g; $form->{donumber} =~ s/\s*$//g; @@ -1112,6 +1131,12 @@ sub display_stock_in_form { my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); + # Standardlagerplatz für Standard-Auslagern verwenden, falls keiner für die Ware explizit definiert wurde + if ($::instance_conf->get_transfer_default_use_master_default_bin) { + $part_info->{warehouse_id} ||= $::instance_conf->get_default_warehouse_id; + $part_info->{bin_id} ||= $::instance_conf->get_default_bin_id; + } + my $units = AM->retrieve_units(\%myconfig, $form); # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor my $units_data = AM->unit_select_data($units, $form->{do_unit}, undef, $part_info->{unit}); @@ -1123,7 +1148,7 @@ sub display_stock_in_form { get_basic_bin_wh_info($stock_info); - $form->header(); + $form->header(no_layout => 1); print $form->parse_html_template('do/stock_in_form', { 'UNITS' => $units_data, 'STOCK_INFO' => $stock_info, 'PART_INFO' => $part_info, }); @@ -1217,7 +1242,7 @@ sub stock_out_form { } } - $form->header(); + $form->header(no_layout => 1); print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data, 'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents, 'PART_INFO' => $part_info, }); @@ -1417,7 +1442,7 @@ sub transfer_out { my $pinfo = $part_info_map{$request->{parts_id}}; my $binfo = $bin_info_map{$request->{bin_id}}; - if ($::lx_office_conf{features}->{show_best_before}) { + if ($::instance_conf->get_show_bestbefore) { push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.", $pinfo->{description}, $binfo->{warehouse_description}, @@ -1492,7 +1517,8 @@ sub dispatcher { my $form = $main::form; my $locale = $main::locale; - foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_in mark_closed save_as_new invoice delete)) { + foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default + transfer_in transfer_in_default mark_closed save_as_new invoice delete)) { if ($form->{"action_${action}"}) { call_sub($action); return; @@ -1501,3 +1527,164 @@ sub dispatcher { $form->error($locale->text('No action defined.')); } + +sub transfer_out_default { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + + transfer_in_out_default('direction' => 'out'); + + $main::lxdebug->leave_sub(); +} + +sub transfer_in_default { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + + transfer_in_out_default('direction' => 'in'); + + $main::lxdebug->leave_sub(); +} + +# Falls das Standardlagerverfahren aktiv ist, wird +# geprüft, ob alle Standardlagerplätze für die Auslager- +# artikel vorhanden sind UND ob die Warenmenge ausreicht zum +# Auslagern. Falls nicht wird entsprechend eine Fehlermeldung +# generiert. Offen Chargennummer / bestbefore wird nicht berücksichtigt +sub transfer_in_out_default { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + my %params = @_; + + my (%missing_default_bins, %qty_parts, @all_requests, %part_info_map, $default_warehouse_id, $default_bin_id); + + Common::check_params(\%params, qw(direction)); + + # entsprechende defaults holen, falls standardlagerplatz verwendet werden soll + if ($::instance_conf->get_transfer_default_use_master_default_bin) { + $default_warehouse_id = $::instance_conf->get_default_warehouse_id; + $default_bin_id = $::instance_conf->get_default_bin_id; + } + + + my @part_ids = map { $form->{"id_${_}"} } (1 .. $form->{rowcount}); + if (@part_ids) { + my $units = AM->retrieve_units(\%myconfig, $form); + %part_info_map = IC->get_basic_part_info('id' => \@part_ids); + foreach my $i (1 .. $form->{rowcount}) { + next unless ($form->{"id_$i"}); + my $base_unit_factor = $units->{ $part_info_map{$form->{"id_$i"}}->{unit} }->{factor} || 1; + my $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor; + $qty_parts{$form->{"id_$i"}} += $qty; + + + $part_info_map{$form->{"id_$i"}}{bin_id} ||= $default_bin_id; + $part_info_map{$form->{"id_$i"}}{warehouse_id} ||= $default_warehouse_id; + + push @all_requests, { + 'chargenumber' => '', #?? die müsste entsprechend geholt werden + #'bestbefore' => undef, # TODO wird nicht berücksichtigt + 'bin_id' => $part_info_map{$form->{"id_$i"}}{bin_id}, + 'qty' => $qty, + 'parts_id' => $form->{"id_$i"}, + 'comment' => 'Default transfer DO', + 'ok' => 1, + 'unit' => $part_info_map{$form->{"id_$i"}}{unit}, + 'warehouse_id' => $part_info_map{$form->{"id_$i"}}{warehouse_id}, + 'oe_id' => $form->{id}, + 'project_id' => $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id} + }; + } + + # jetzt wird erst überprüft, ob die Stückzahl entsprechend stimmt. + if ($params{direction} eq 'out') { # wird nur für ausgehende Mengen benötigit + foreach my $key (keys %qty_parts) { + + $missing_default_bins{$key}{missing_bin} = 1 unless ($part_info_map{$key}{bin_id}); + next unless ($part_info_map{$key}{bin_id}); # abbruch + + my ($max_qty, $error) = WH->get_max_qty_parts_bin(parts_id => $key, bin_id => $part_info_map{$key}{bin_id}); + if ($error == 1) { + # wir können nicht entscheiden, welche charge oder mhd (bestbefore) ausgewählt sein soll + # deshalb rückmeldung nach oben geben, manuell auszulagern + # TODO Bei nur einem Treffer mit Charge oder bestbefore wäre das noch möglich + $missing_default_bins{$key}{chargenumber} = 1; + } + if ($max_qty < $qty_parts{$key}){ + $missing_default_bins{$key}{missing_qty} = $max_qty - $qty_parts{$key}; + } + } + } + } # if @parts_id + + # Abfrage für Fehlerbehandlung (nur bei direction == out) + if (scalar (keys %missing_default_bins)) { + my $fehlertext; + foreach my $fehler (keys %missing_default_bins) { + + my $ware = WH->get_part_description(parts_id => $fehler); + if ($missing_default_bins{$fehler}{missing_bin}){ + $fehlertext .= "Kein Standardlagerplatz definiert bei $ware
"; + } + if ($missing_default_bins{$fehler}{missing_qty}) { # missing_qty + $fehlertext .= "Es fehlen " . $missing_default_bins{$fehler}{missing_qty}*-1 . + " von $ware auf dem Standard-Lagerplatz " . $part_info_map{$fehler}{bin} . " zum Auslagern
"; + } + if ($missing_default_bins{$fehler}{chargenumber}){ + $fehlertext .= "Die Ware hat eine Chargennummer oder eine Mindesthaltbarkeit definiert. + Hier kann man nicht automatisch entscheiden. + Bitte diesen Lieferschein manuell auslagern. + Bei: $ware"; + } + # auslagern soll immer gehen, auch wenn nicht genügend auf lager ist. + # der lagerplatz ist hier extra konfigurierbar, bspw. Lager-Korrektur mit + # Lagerplatz Lagerplatz-Korrektur + my $default_warehouse_id_ignore_onhand = $::instance_conf->get_default_warehouse_id_ignore_onhand; + my $default_bin_id_ignore_onhand = $::instance_conf->get_default_bin_id_ignore_onhand; + if ($::instance_conf->get_transfer_default_ignore_onhand && $default_bin_id_ignore_onhand) { + # entsprechende defaults holen + # falls chargenumber, bestbefore oder anzahl nicht stimmt, auf automatischen + # lagerplatz wegbuchen! + foreach (@all_requests) { + if ($_->{parts_id} eq $fehler){ + $_->{bin_id} = $default_bin_id_ignore_onhand; + $_->{warehouse_id} = $default_warehouse_id_ignore_onhand; + } + } + } else { + #$main::lxdebug->message(0, 'Fehlertext: ' . $fehlertext); + $form->show_generic_error($locale->text("Cannot transfer.
Reason:
#1", $fehlertext ), 'back_button' => 1); + } + } + } + + + # hier der eigentliche fallunterschied für in oder out + my $prefix = $params{direction} eq 'in' ? 'in' : 'out'; + + # dieser array_ref ist für DO->save da: + # einmal die all_requests in YAML verwandeln, damit delivery_order_items_stock + # gefüllt werden kann. + my $i = 1; + foreach (@all_requests){ + $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]); + $i++; + } + + save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern + # und in delivery_order_items_stock speichern + DO->transfer_in_out('direction' => $prefix, + 'requests' => \@all_requests); + + SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1); + + $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'out'; + $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'in'; + $form->redirect; + +}