X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Foe.pl;h=cb7402aa338238d42fd7ed387858d88595d613fc;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=43b360f5317d21a11091a02e03b75f34ca557ae2;hpb=563cbd552dc52fb59a28cccd33d2672e1933be54;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 43b360f53..cb7402aa3 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -38,6 +38,7 @@ 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); @@ -205,7 +206,6 @@ sub order_links { $form->{jsscript} = 1; my $editing = $form->{id}; - $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes)); OE->retrieve(\%myconfig, \%$form); @@ -218,6 +218,7 @@ sub order_links { $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"}; + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes)); $form->{shipto} = 1 if $form->{id}; # get customer / vendor @@ -237,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(); } @@ -342,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}) { @@ -507,8 +511,8 @@ sub update { my $rows = scalar @{ $form->{item_list} }; # 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 || + # 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); @@ -523,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}; @@ -588,274 +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'); - } + $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'); - # 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| -