X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=cb7402aa338238d42fd7ed387858d88595d613fc;hb=1163cee7d5cfe9355a9d231ac544ce0943623d77;hp=eb0916fc4690b1fbb5f9689684017e01bab5ce8e;hpb=96d3ef850a6170a3cbada36eb7f375ef99efe373;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index eb0916fc4..cb7402aa3 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -38,9 +38,11 @@ use SL::FU; use SL::OE; use SL::IR; use SL::IS; +use SL::MoreCommon qw(ary_diff); use SL::PE; use SL::ReportGenerator; use List::Util qw(max reduce sum); +use Data::Dumper; require "bin/mozilla/io.pl"; require "bin/mozilla/arap.pl"; @@ -236,7 +238,10 @@ sub order_links { } $form->{"old$form->{vc}"} = $form->{$form->{vc}}; - $form->{"old$form->{vc}"} .= qq|--$form->{"$form->{vc}_id"}| unless ($form->{"old$form->{vc}"} =~ m/--\d+$/); + + if ($form->{"old$form->{vc}"} !~ m/--\d+$/ && $form->{"$form->{vc}_id"}) { + $form->{"old$form->{vc}"} .= qq|--$form->{"$form->{vc}_id"}| + } $lxdebug->leave_sub(); } @@ -248,9 +253,12 @@ sub prepare_order { $form->{formname} ||= $form->{type}; + # format discounts if values come from db. either as single id, or as a collective order + my $format_discounts = $form->{id} || $form->{convert_from_oe_ids}; + for my $i (1 .. $form->{rowcount}) { $form->{"reqdate_$i"} ||= $form->{"deliverydate_$i"}; - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * ($form->{id} ? 100 : 1)); + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * ($format_discounts ? 100 : 1)); $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}); $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); } @@ -338,7 +346,7 @@ sub form_header { $credittext = $locale->text('Credit Limit exceeded!!!'); my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' }; - $follow_up_vc =~ s/--.*?//; + $follow_up_vc =~ s/--\d*\s*$//; $TMPL_VAR{follow_up_trans_info} = ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)"; if ($form->{id}) { @@ -462,6 +470,8 @@ sub update { check_oe_access(); +# $main::lxdebug->message(0, Dumper($form)); + set_headings($form->{"id"} ? "edit" : "add"); map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call; @@ -488,8 +498,8 @@ sub update { && ($form->{"partsgroup_$i"} eq "")) { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); - &check_form; + &check_form; } else { if ($form->{type} =~ /^sales/) { @@ -500,7 +510,11 @@ sub update { my $rows = scalar @{ $form->{item_list} }; - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100); + # hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen + # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009 + # select discount as vendor_discount from vendor || + # select discount as customer_discount from customer + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100); if ($rows) { $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); @@ -513,9 +527,17 @@ sub update { } else { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"}; + # hier werden parts (Artikeleigenschaften) aus item_list (retrieve_item aus IS.pm) + # (item wahrscheinlich synonym für parts) entsprechend in die form geschrieben ... + + # Wäre dieses Mapping nicht besser in retrieve_items aufgehoben? + #(Eine Funktion bekommt Daten -> ARBEIT -> Rückgabe DATEN) + # Das quot sieht doch auch nach Überarbeitung aus ... (hmm retrieve_items gibt es in IS und IR) map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; + + # ... deswegen muss die prüfung, ob es sich um einen nicht rabattierfähigen artikel handelt später erfolgen (Bug 1136) + $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"}; $form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne ""; $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor}; @@ -578,258 +600,50 @@ sub search { check_oe_access(); if ($form->{type} eq 'purchase_order') { - $form->{title} = $locale->text('Purchase Orders'); - $form->{vc} = 'vendor'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Employee'); - } - - if ($form->{type} eq 'request_quotation') { - $form->{title} = $locale->text('Request for Quotations'); - $form->{vc} = 'vendor'; - $ordlabel = $locale->text('RFQ Number'); - $ordnumber = 'quonumber'; - $employee = $locale->text('Employee'); - } - - if ($form->{type} eq 'sales_order') { - $form->{title} = $locale->text('Sales Orders'); - $form->{vc} = 'customer'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Employee'); - } - - if ($form->{type} eq 'sales_quotation') { - $form->{title} = $locale->text('Quotations'); - $form->{vc} = 'customer'; - $ordlabel = $locale->text('Quotation Number'); - $ordnumber = 'quonumber'; - $employee = $locale->text('Employee'); - } - - # setup vendor / customer selection - $form->all_vc(\%myconfig, $form->{vc}, - ($form->{vc} eq 'customer') ? "AR" : "AP"); - - # departments - if (@{ $form->{all_departments} }) { - $form->{selectdepartment} = "\n" - } (@{ $form->{all_departments} }); - } - - $department = qq| - - | . $locale->text('Department') . qq| - - -| if $form->{selectdepartment}; + $form->{vc} = 'vendor'; + $form->{ordnrname} = 'ordnumber'; + $form->{title} = $locale->text('Purchase Orders'); + $form->{ordlabel} = $locale->text('Order Number'); + + } elsif ($form->{type} eq 'request_quotation') { + $form->{vc} = 'vendor'; + $form->{ordnrname} = 'quonumber'; + $form->{title} = $locale->text('Request for Quotations'); + $form->{ordlabel} = $locale->text('RFQ Number'); + + } elsif ($form->{type} eq 'sales_order') { + $form->{vc} = 'customer'; + $form->{ordnrname} = 'ordnumber'; + $form->{title} = $locale->text('Sales Orders'); + $form->{ordlabel} = $locale->text('Order Number'); + + } elsif ($form->{type} eq 'sales_quotation') { + $form->{vc} = 'customer'; + $form->{ordnrname} = 'quonumber'; + $form->{title} = $locale->text('Quotations'); + $form->{ordlabel} = $locale->text('Quotation Number'); - my $delivered; - if (($form->{"type"} eq "sales_order") || - ($form->{"type"} eq "purchase_order")) { - $delivered = qq| - - - - - - -|; + } else { + $form->show_generic_error($locale->text('oe.pl::search called with unknown type'), back_button => 1); } - # use JavaScript Calendar or not - $form->{jsscript} = 1; - $jsscript = ""; - - $button1 = qq| - - text('button') . qq|> - |; - $button2 = qq| - - text('button') . qq|> - |; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3", - "transdateto", "BL", "trigger4"); - - my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; - - $form->get_lists("projects" => { "key" => "ALL_PROJECTS", - "all" => 1 }, - "employees" => "ALL_EMPLOYEES", - "salesmen" => "ALL_SALESMEN", - $vc => "ALL_" . uc($vc) - ); - - my %labels = (); - my @values = (""); - foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"projectnumber"}; - } - my $projectnumber = - NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values, - '-labels' => \%labels)); - - #employees - %labels = (); - @values = (""); - foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}; - } - - #salesmen - my %labels_salesmen = (); - my @values_salesmen = (''); - foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { - push(@values_salesmen, $item->{"id"}); - $labels_salesmen{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}; - } - - my $employee_block = qq| - - | . $locale->text('Employee') . qq| - | . NTI($cgi->popup_menu('-name' => 'employee_id', '-values' => \@values, '-labels' => \%labels)) . qq| - - - | . $locale->text('Salesman') . qq| - | . - NTI($cgi->popup_menu('-name' => 'salesman_id', - '-values' => \@values_salesmen, - '-labels' => \%labels_salesmen)) . qq| - - |; - - %labels = (); - @values = (""); - - foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) { - push(@values, $item->{name}.qq|--|.$item->{"id"}); - $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; - } - - my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor'); - $vc = - $myconfig{vclimit} <= scalar(@values) - ? qq|{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| - : NTI($cgi->popup_menu('-name' => "$form->{vc}", - '-default' => $form->{"old$form->{vc}"}, - '-onChange' => 'document.getElementById(\'update_button\').click();', - '-values' => \@values, - '-labels' => \%labels)); - $form->header; - - print qq| - - -
{script}> - - - - - - - - - - -
$form->{title}
- - - - - -$department - - - - -$employee_block - - - - - - - - - - $button1 - $button2 - - - - - - -
$vc_label$vc
$ordlabel
| . $locale->text('Transaction description') . qq|
| . $locale->text("Project Number") . qq|$projectnumber
| . $locale->text('From') . qq|| . $locale->text('Bis') . qq|
| . $locale->text('Include in Report') . qq| - - - - - - $delivered - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| . $locale->text('ID') . qq| $ordlabel
| . $locale->text('Date') . qq| | . $locale->text('Required by') . qq|
$vc_label $employee | . $locale->text('Ship via') . qq|
| . $locale->text('Amount') . qq| | . $locale->text('Tax') . qq| | . $locale->text('Total') . qq|
| . $locale->text('Ertrag') . qq| | . $locale->text('Ertrag prozentual') . qq|
| . $locale->text('Project Number') . qq| | . $locale->text('Transaction description') . qq|
| . $locale->text('Subtotal') . qq| | . $locale->text('Salesman') . qq|
-
-
- -$jsscript + # setup vendor / customer data + $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, + "employees" => "ALL_EMPLOYEES", + "salesmen" => "ALL_SALESMEN", + "departments" => "ALL_DEPARTMENTS", + "$form->{vc}s" => "ALL_VC"); + + # constants and subs for template + $form->{jsscript} = 1; + $form->{employee_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} }; + $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; + $form->{salesman_labels} = $form->{employee_labels}; -
- -{vc}> -{type}> + $form->header(); - -
- - - -|; + print $form->parse_html_template('oe/search', { %myconfig }); $lxdebug->leave_sub(); } @@ -859,7 +673,7 @@ sub orders { $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; - ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} }); + ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} }); report_generator_set_default_sort('transdate', 1); @@ -876,7 +690,8 @@ sub orders { "salesman", "shipvia", "globalprojectnumber", "transaction_description", "open", - "delivered", "marge_total", "marge_percent" + "delivered", "marge_total", "marge_percent", + "country", "ustid", ); # only show checkboxes if gotten here via sales_order form. @@ -912,7 +727,8 @@ sub orders { my @hidden_variables = map { "l_${_}" } @columns; push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber - transaction_description transdatefrom transdateto type vc employee_id salesman_id); + transaction_description transdatefrom transdateto type vc employee_id salesman_id + reqdatefrom reqdateto); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); @@ -936,7 +752,9 @@ sub orders { 'open' => { 'text' => $locale->text('Open'), }, 'delivered' => { 'text' => $locale->text('Delivered'), }, 'marge_total' => { 'text' => $locale->text('Ertrag'), }, - 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), } + 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }, + 'country' => { 'text' => $locale->text('Country'), }, + 'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, ); foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) { @@ -952,7 +770,7 @@ sub orders { $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options('orders', @hidden_variables); + $report->set_export_options('orders', @hidden_variables, qw(sort sortdir)); $report->set_sort_indicator($form->{sort}, $form->{sortdir}); my @options; @@ -964,8 +782,16 @@ sub orders { push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description}; - push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom}; - push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto}; + if ( $form->{transdatefrom} or $form->{transdateto} ) { + push @options, $locale->text('Order Date'); + push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom}; + push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto}; + }; + if ( $form->{reqdatefrom} or $form->{reqdateto} ) { + push @options, $locale->text('Delivery Date'); + push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom}; + push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto}; + }; push @options, $locale->text('Open') if $form->{open}; push @options, $locale->text('Closed') if $form->{closed}; push @options, $locale->text('Delivered') if $form->{delivered}; @@ -1275,8 +1101,8 @@ sub save { $form->{simple_save} = 1; if(!$form->{print_and_save}) { - set_headings("edit"); - &update; + delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type)])}; + edit(); exit; } $lxdebug->leave_sub(); @@ -1365,8 +1191,9 @@ sub invoice { check_oe_access(); $auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit'); - $form->{old_employee_id} = $form->{employee_id}; $form->{old_salesman_id} = $form->{salesman_id}; + $form->get_employee(); + if ($form->{type} =~ /_order$/) { @@ -1459,7 +1286,7 @@ sub invoice { require "bin/mozilla/$form->{script}"; - map { $form->{"select$_"} = "" } ($form->{vc}, currency); + map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); $currency = $form->{currency}; &invoice_links; @@ -1660,8 +1487,7 @@ sub save_as_new { check_oe_access(); $form->{saveasnew} = 1; - $form->{closed} = 0; - map { delete $form->{$_} } qw(printed emailed queued); + map { delete $form->{$_} } qw(printed emailed queued delivered closed); # Let Lx-Office 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. @@ -1673,6 +1499,17 @@ sub save_as_new { delete($form->{$idx}); } + # clear reqdate unless changed + if ($form->{reqdate} && $form->{id}) { + my $saved_order = OE->retrieve_simple(id => $form->{id}); + if ($saved_order && $saved_order->{reqdate} eq $form->{reqdate}) { + delete $form->{reqdate}; + } + } + + # update employee + $form->get_employee(); + &save; $lxdebug->leave_sub(); @@ -1752,6 +1589,8 @@ sub purchase_order { $form->{vc} = "vendor"; $form->{type} = "purchase_order"; + $form->get_employee(); + &poso; $lxdebug->leave_sub(); @@ -1773,6 +1612,8 @@ sub sales_order { $form->{vc} = "customer"; $form->{type} = "sales_order"; + $form->get_employee(); + &poso; $lxdebug->leave_sub(); @@ -1798,7 +1639,7 @@ sub poso { ordnumber); for $i (1 .. $form->{rowcount}) { - map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor); + map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount); } my %saved_vars = map { $_ => $form->{$_} } grep { $form->{$_} } qw(currency); @@ -1809,6 +1650,12 @@ sub poso { &prepare_order; + # prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5) + # and therefore multiplies the values by 100 in the case of reading from db or making an order from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01 + for $i (1 .. $form->{rowcount}) { + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 0.01); + }; + # format amounts for $i (1 .. $form->{rowcount} - 1) { map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit); @@ -1835,8 +1682,11 @@ sub delivery_order { $form->{type} = 'purchase_delivery_order'; } + $form->get_employee(); + require "bin/mozilla/do.pl"; + $form->{script} = 'do.pl'; $form->{cp_id} *= 1; $form->{convert_from_oe_ids} = $form->{id}; $form->{transdate} = $form->current_date(\%myconfig); @@ -1849,7 +1699,7 @@ sub delivery_order { delete @{$form}{qw(id subject message cc bcc printed emailed queued creditlimit creditremaining discount tradediscount oldinvtotal closed delivered)}; for $i (1 .. $form->{rowcount}) { - map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor); + map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount); } my %old_values = map { $_ => $form->{$_} } qw(customer_id oldcustomer customer vendor_id oldvendor vendor);