From: Sven Schöling Date: Thu, 5 Nov 2009 10:18:08 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~126 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/d0655093e8562bcc88ffe7283646b4ef3a2aa4a8?hp=85f6a0101a9ac918ce2aea54fa39f711adbb535b Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index d844675b3..7c9ee98ef 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -490,6 +490,12 @@ sub form_footer { print_options => print_options(inline => 1), label_edit => $locale->text("Edit the $form->{type}"), label_workflow => $locale->text("Workflow $form->{type}"), + is_sales => scalar ($form->{type} =~ /^sales_/), # these vars are exported, so that the template + is_order => scalar ($form->{type} =~ /_order$/), # may determine what to show + is_sales_quo => scalar ($form->{type} =~ /sales_quotation$/), + is_req_quo => scalar ($form->{type} =~ /request_quotation$/), + is_sales_ord => scalar ($form->{type} =~ /sales_order$/), + is_pur_ord => scalar ($form->{type} =~ /purchase_order$/), }); $main::lxdebug->leave_sub(); @@ -776,7 +782,7 @@ 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 - reqdatefrom reqdateto); + reqdatefrom reqdateto projectnumber); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);