Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d844675b37824d01f0c214871934e2faae311cfc..7c9ee98efb02ed1ddae125905ae617dcfd1e105d 100644 (file)
--- 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);