X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=b1845ab199924919fd7369aa070a10f438c2127e;hb=710ebb28d9a0f0125dd7e7d1f0662d3127ac1328;hp=1969608251094155a92b867eef5400e2745062ec;hpb=19688fcacc86e86dd6ff5c5427e3b50893bb60f0;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 196960825..b1845ab19 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -41,6 +41,7 @@ use SL::IS; 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 +237,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(); } @@ -341,7 +345,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}) { @@ -465,6 +469,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; @@ -491,8 +497,8 @@ sub update { && ($form->{"partsgroup_$i"} eq "")) { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); - &check_form; + &check_form; } else { if ($form->{type} =~ /^sales/) { @@ -503,7 +509,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"}); @@ -581,274 +591,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'); - } + $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'); - 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| -