X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=1969608251094155a92b867eef5400e2745062ec;hb=ea2e84cc75e2879141eea5e957439936280682bf;hp=2ebeab92f68667c5e6f49fa3298c109b142e1546;hpb=9a4cae85ab396fffe30deb0ca7d6de1939dd462f;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 2ebeab92f..196960825 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -248,9 +248,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"}); } @@ -274,16 +277,6 @@ sub form_header { # use JavaScript Calendar or not $form->{jsscript} = 1; - $TMPL_VAR{button1} = qq| - - text('button') . qq|> - |; - $TMPL_VAR{button2} = qq| - - text('button') . qq|> - |; - #write Trigger - $TMPL_VAR{jsscript} = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2"); # openclosed checkboxes my @tmp; @@ -293,18 +286,7 @@ sub form_header { $form->{"closed"} ? "checked" : "", $locale->text('Closed') if $form->{id}; $TMPL_VAR{openclosed} = sprintf qq|%s\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp; - # set option selected - foreach $item ($form->{vc}, 'currency', 'department', ($form->{vc} eq "customer" ? 'customer' : 'vendor')) { - $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } - - #quote select[customer|vendor] Bug 133 - $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); - - #substitute \n and \r to \s (bug 543) - $form->{"select$form->{vc}"} =~ s/[\n\r]/ /g; - + # project ids my @old_project_ids = ($form->{"globalproject_id"}, grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{"rowcount"}); my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; @@ -327,7 +309,7 @@ sub form_header { $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; $TMPL_VAR{shipto_labels} = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) }; $TMPL_VAR{contact_labels} = sub { join(', ', $_[0]->{"cp_name"}, $_[0]->{"cp_givenname"}) . ($_[0]->{cp_abteilung} ? " ($_[0]->{cp_abteilung})" : "") }; - $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" }; + $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" }; # vendor/customer $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; @@ -350,11 +332,10 @@ sub form_header { # credit remaining $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0; $TMPL_VAR{is_credit_remaining_negativ} = ($form->{creditremaining} =~ /-/) ? "0" : "1"; - + # business $TMPL_VAR{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type')); - push @custom_hiddens, "ordnumber" if $form->{type} =~ /_quotation$/; push @custom_hiddens, "customer_klass" if $form->{vc} eq 'customer'; $credittext = $locale->text('Credit Limit exceeded!!!'); @@ -441,7 +422,7 @@ sub form_footer { } } - $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); +# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this } else { foreach $item (split / /, $form->{taxaccounts}) { @@ -479,8 +460,7 @@ sub form_footer { sub update { $lxdebug->enter_sub(); - - $form->{"Watchdog::shipvia"} = 1; + my ($recursive_call) = shift; check_oe_access(); @@ -489,13 +469,13 @@ sub update { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call; $form->{update} = 1; - + $payment_id = $form->{payment_id} if $form->{payment_id}; - + &check_name($form->{vc}); - + $form->{payment_id} = $payment_id if $form->{payment_id} eq ""; - + $buysell = 'buy'; $buysell = 'sell' if ($form->{vc} eq 'vendor'); $form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell); @@ -680,11 +660,22 @@ sub search { text('button') . qq|> |; - + $button3 = qq| + + text('button') . qq|> + |; + $button4 = qq| + + text('button') . qq|> + |; + #write Trigger $jsscript = - Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3", - "transdateto", "BL", "trigger4"); + Form->write_trigger(\%myconfig, "4", "transdatefrom", "BR", "trigger3", + "transdateto", "BL", "trigger4", + "reqdatefrom", "BR", "trigger5", "reqdateto", "BL", "trigger6"); my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; @@ -712,7 +703,7 @@ sub search { push(@values, $item->{"id"}); $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}; } - + #salesmen my %labels_salesmen = (); my @values_salesmen = (''); @@ -746,7 +737,7 @@ sub search { my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor'); $vc = $myconfig{vclimit} <= scalar(@values) - ? qq|{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| + ? qq|{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| : NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, '-onChange' => 'document.getElementById(\'update_button\').click();', @@ -786,10 +777,15 @@ $employee_block $projectnumber - | . $locale->text('From') . qq| $button1 + | . $locale->text('Order Date') . " " . $locale->text('From') . qq| $button1 | . $locale->text('Bis') . qq| $button2 + + | . $locale->text('Delivery Date') . " " . $locale->text('From') . qq| $button3 + | . $locale->text('Bis') . qq| $button4 + + | . $locale->text('Include in Report') . qq| @@ -810,7 +806,7 @@ $employee_block $vc_label $employee - + | . $locale->text('Ship via') . qq| @@ -935,7 +931,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); @@ -962,7 +959,7 @@ sub orders { 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), } ); - foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia)) { + foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } @@ -975,7 +972,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; @@ -987,8 +984,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}; @@ -1128,14 +1133,14 @@ sub save_and_close { if ($form->{currency} ne $form->{defaultcurrency}); &validate_items; - - if($form->{payment_id}) { + + if($form->{payment_id}) { $payment_id = $form->{payment_id}; } - + # if the name changed get new values if (&check_name($form->{vc})) { - if($form->{payment_id} eq "") { + if($form->{payment_id} eq "") { $form->{payment_id} = $payment_id; } &update; @@ -1230,14 +1235,14 @@ sub save { if ($form->{currency} ne $form->{defaultcurrency}); &validate_items; - - if($form->{payment_id}) { + + if($form->{payment_id}) { $payment_id = $form->{payment_id}; } - + # if the name changed get new values if (&check_name($form->{vc})) { - if($form->{payment_id} eq "") { + if($form->{payment_id} eq "") { $form->{payment_id} = $payment_id; } &update; @@ -1294,7 +1299,7 @@ sub save { $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } - # /saving the history + # /saving the history $form->{simple_save} = 1; if(!$form->{print_and_save}) { @@ -1373,7 +1378,7 @@ sub delete_order_quotation { $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } - # /saving the history + # /saving the history $form->info($msg); exit(); } @@ -1409,9 +1414,9 @@ sub invoice { $form->{ordnumber} = ""; $form->{quodate} = $form->{transdate}; } - + $payment_id = $form->{payment_id} if $form->{payment_id}; - + # if the name changed get new values if (&check_name($form->{vc})) { $form->{payment_id} = $payment_id if $form->{payment_id} eq ""; @@ -1464,7 +1469,7 @@ sub invoice { $buysell = 'sell'; } - if ( $form->{type} eq 'sales_order' + if ( $form->{type} eq 'sales_order' || $form->{type} eq 'sales_quotation') { $form->{title} = $locale->text('Add Sales Invoice'); $form->{script} = 'is.pl'; @@ -1817,7 +1822,8 @@ sub poso { $form->{old_salesman_id} = $form->{salesman_id}; # reset - map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered); + map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered + ordnumber); for $i (1 .. $form->{rowcount}) { map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor);