ActionBar: existierende Inputs namens »action« vor Submit entfernen

[mfinanz.git] / bin / mozilla / oe.pl

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 4f28be89afc8e2c1eba7bc7efece955b3cee1ded..f2461211284d2d2b82e962ad34372196586fd8f1 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -51,6 +51,7 @@ use Data::Dumper;
 use SL::DB::Customer;
 use SL::DB::TaxZone;
 use SL::DB::PaymentTerm;
 use SL::DB::Customer;
 use SL::DB::TaxZone;
 use SL::DB::PaymentTerm;

+use SL::DB::Vendor;

 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/io.pl";
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/io.pl";


@@ -308,96 +309,129 @@ sub setup_oe_action_bar {
       && $params{obj}->periodic_invoices_config->get_previous_billed_period_start_date;
   }
 
       && $params{obj}->periodic_invoices_config->get_previous_billed_period_start_date;
   }
 

-  my $allow_invoice  = $params{is_req_quo}
-                    || $params{is_pur_ord}
-                    || ($params{is_sales_quo} && $::instance_conf->get_allow_sales_invoice_from_sales_quotation)
-                    || ($params{is_sales_ord} && $::instance_conf->get_allow_sales_invoice_from_sales_order);
-  my @req_trans_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps;
-  my @warn_p_invoice = qw(kivi.SalesPurchase.oe_warn_save_active_periodic_invoice) x!!$has_active_periodic_invoice;
-
-  my $tpca_remainder = 0;
+  my $allow_invoice      = $params{is_req_quo}
+                        || $params{is_pur_ord}
+                        || ($params{is_sales_quo} && $::instance_conf->get_allow_sales_invoice_from_sales_quotation)
+                        || ($params{is_sales_ord} && $::instance_conf->get_allow_sales_invoice_from_sales_order);
+  my @req_trans_desc     = qw(kivi.SalesPurchase.check_transaction_description)         x!!$::instance_conf->get_require_transaction_description_ps;
+  my @req_trans_cost_art = qw(kivi.SalesPurchase.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
+  my @warn_p_invoice     = qw(kivi.SalesPurchase.oe_warn_save_active_periodic_invoice)  x!!$has_active_periodic_invoice;

 
   for my $bar ($::request->layout->get('actionbar')) {
 
   for my $bar ($::request->layout->get('actionbar')) {

-    $bar->add_actions([ t8('Update'),
-      submit    => [ '#form', { action_update => 1 } ],
-      id        => 'update_button',
-      accesskey => 'enter',
-    ]);
-
-    $bar->add_actions("combobox");
-    $bar->actions->[-1]->add_actions([ t8('Save'),
-      submit  => [ '#form', { action_save => 1 } ],
-      checks  => [ @req_trans_desc, @warn_p_invoice ],
-      confirm => t8('Missing transport cost: #1  Are you sure?', $tpca_remainder),
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Save as new'),
-      submit   => [ '#form', { action_save_as_new => 1 } ],
-      checks   => [ @req_trans_desc ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]);
-     $bar->actions->[-1]->add_actions([ t8('Save and Close'),
-      submit  => [ '#form', { action_save_and_close => 1 } ],
-      checks  => [ @req_trans_desc, @warn_p_invoice ],
-      confirm => t8('Missing transport cost: #1  Are you sure?', $tpca_remainder),
-    ]);
-    $bar->add_actions([ t8('Delete'),
-      submit   => [ '#form', { action_delete => 1 } ],
-      confirm  => t8('Do you really want to delete this object?'),
-      disabled => !$form->{id}                                                                      ? t8('This record has not been saved yet.')
-                : (   ($params{is_sales_ord} && !$::instance_conf->get_sales_order_show_delete)
-                   || ($params{is_pur_ord}   && !$::instance_conf->get_purchase_order_show_delete)) ? t8('Deleting this type of record has been disabled in the configuration.')
-                :                                                                                     undef,
-    ]);
+    $bar->add(
+      action => [
+        t8('Update'),
+        submit    => [ '#form', { action => "update" } ],
+        id        => 'update_button',
+        accesskey => 'enter',
+      ],
+
+      combobox => [
+        action => [
+          t8('Save'),
+          submit  => [ '#form', { action => "save" } ],
+          checks  => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ],
+        ],
+        action => [
+          t8('Save as new'),
+          submit   => [ '#form', { action => "save_as_new" } ],
+          checks   => [ @req_trans_desc, @req_trans_cost_art ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
+        action => [
+          t8('Save and Close'),
+          submit  => [ '#form', { action => "save_and_close" } ],
+          checks  => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ],
+        ],
+        action => [
+          t8('Delete'),
+          submit   => [ '#form', { action => "delete" } ],
+          confirm  => t8('Do you really want to delete this object?'),
+          disabled => !$form->{id}                                                                      ? t8('This record has not been saved yet.')
+                    : (   ($params{is_sales_ord} && !$::instance_conf->get_sales_order_show_delete)
+                       || ($params{is_pur_ord}   && !$::instance_conf->get_purchase_order_show_delete)) ? t8('Deleting this type of record has been disabled in the configuration.')
+                    :                                                                                     undef,
+        ],
+      ], # end of combobox "Save"
+
+      'separator',
+
+      combobox => [
+        action => [ t8('Workflow') ],
+        (action => [
+          t8('Sales Order'),
+          submit   => [ '#form', { action => "sales_order" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ]) x !!$params{is_sales_quo},
+        (action => [
+          t8('Purchase Order'),
+          submit   => [ '#form', { action => "sales_order" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ]) x !!$params{is_req_quo},
+        (action => [
+          t8('Delivery Order'),
+          submit   => [ '#form', { action => "delivery_order" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ]) x ($params{is_sales_ord} || $params{is_pur_ord}),
+        (action => [
+          t8('Invoice'),
+          submit   => [ '#form', { action => "invoice" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ]) x !!$allow_invoice,
+        action => [
+          t8('Quotation'),
+          submit   => [ '#form', { action => "quotation" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
+        action => [
+          t8('Request for Quotation'),
+          submit   => [ '#form', { action => "reqest_for_quotation" } ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
+      ], # end of combobox "Workflow"
+
+      combobox => [
+        action => [ t8('Export') ],
+        action => [
+          t8('Print'),
+          call   => [ 'kivi.SalesPurchase.show_print_dialog' ],
+          checks => [ @req_trans_desc ],
+        ],
+        action => [
+          t8('E Mail'),
+          call   => [ 'kivi.SalesPurchase.show_email_dialog' ],
+          checks => [ @req_trans_desc ],
+        ],
+      ], #end of combobox "Export"
+
+      combobox => [
+        action => [ t8('more') ],
+        action => [
+          t8('History'),
+          call     => [ 'set_history_window', $form->{id} * 1, 'id' ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
+        action => [
+          t8('Follow-Up'),
+          call     => [ 'follow_up_window' ],
+          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
+      ], # end of combobox "more"
+    );
+  }
+}

 
 

-    $bar->add_actions('separator');
-
-    $bar->add_actions('combobox');
-    $bar->actions->[-1]->add_actions([ t8('Workflow') ]);
-    $bar->actions->[-1]->add_actions([ t8('Sales Order'),
-      submit   => [ '#form', { action_sales_order => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]) if $params{is_sales_quo};
-    $bar->actions->[-1]->add_actions([ t8('Purchase Order'),
-      submit   => [ '#form', { action_sales_order => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]) if $params{is_req_quo};
-    $bar->actions->[-1]->add_actions([ t8('Delivery Order'),
-      submit   => [ '#form', { action_delivery_order => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]) if $params{is_sales_ord} || $params{is_pur_ord};
-    $bar->actions->[-1]->add_actions([ t8('Invoice'),
-      submit   => [ '#form', { action_invoice => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]) if $allow_invoice;
-    $bar->actions->[-1]->add_actions([ t8('Quotation'),
-      submit   => [ '#form', { action_quotation => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Request for Quotation'),
-      submit   => [ '#form', { action_reqest_for_quotation => 1 } ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]);
+sub setup_oe_search_action_bar {
+  my %params = @_;

 
 

-    $bar->add_actions('combobox');
-    $bar->actions->[-1]->add_actions([ t8('Export') ]);
-    $bar->actions->[-1]->add_actions([ t8('Print'),
-      submit => [ '#form', { action_print => 1 } ],
-      checks => [ @req_trans_desc ],
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('E Mail'),
-      submit => [ '#form', { action_print => 1 } ],
-      checks => [ @req_trans_desc ],
-    ]);
-    $bar->add_actions('combobox');
-    $bar->actions->[-1]->add_actions([ t8('more') ]);
-    $bar->actions->[-1]->add_actions([ t8('History'),
-      call     => [ 'set_history_window', $form->{id} * 1, 'id' ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Follow-Up'),
-      call     => [ 'follow_up_window' ],
-      disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-    ]);
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Search'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );

   }
 }
 
   }
 }
 


@@ -418,6 +452,8 @@ sub form_header {
   if ($form->{id}) {
     $TMPL_VAR{oe_obj} = SL::DB::Order->new(id => $form->{id})->load;
   }
   if ($form->{id}) {
     $TMPL_VAR{oe_obj} = SL::DB::Order->new(id => $form->{id})->load;
   }

+  $TMPL_VAR{vc_obj} = SL::DB::Customer->new(id => $form->{customer_id})->load if $form->{customer_id};
+  $TMPL_VAR{vc_obj} = SL::DB::Vendor->new(id => $form->{vendor_id})->load     if $form->{vendor_id};

 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 


@@ -557,12 +593,11 @@ sub form_header {
   push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
 
   $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
   push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
 
   $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },

-     qw(id action type vc formname media format proforma queued printed emailed
+     qw(id type vc proforma queued printed emailed

         title creditlimit creditremaining tradediscount business
         title creditlimit creditremaining tradediscount business

-        max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
-        CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
-        shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
-        message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
+        max_dunning_level dunning_amount
+        CFDD_shipto CFDD_shipto_id
+        taxpart taxservice taxaccounts cursor_fokus

         show_details useasnew),
         @custom_hiddens,
         map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ];  # deleted: discount
         show_details useasnew),
         @custom_hiddens,
         map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ];  # deleted: discount


@@ -574,6 +609,10 @@ sub form_header {
 
   $TMPL_VAR{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
 
 
   $TMPL_VAR{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
 

+  if ($type_check_vars{is_sales} && $::instance_conf->get_transport_cost_reminder_article_number_id) {
+    $TMPL_VAR{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
+  }
+

   print $form->parse_html_template("oe/form_header", { %TMPL_VAR });
 
   $main::lxdebug->leave_sub();
   print $form->parse_html_template("oe/form_header", { %TMPL_VAR });
 
   $main::lxdebug->leave_sub();


@@ -645,12 +684,11 @@ sub form_footer {
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 

-  my $tpca_reminder;
-  $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id;
+  my $print_options_html = setup_sales_purchase_print_options();
+

   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,
   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,

-     tpca_reminder   => $tpca_reminder,
-     print_options   => print_options(inline => 1),
+     print_options   => $print_options_html,

      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_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$/),


@@ -871,6 +909,8 @@ sub search {
 
   $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project));
 
 
   $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project));
 

+  setup_oe_search_action_bar();
+

   $form->header();
 
   print $form->parse_html_template('oe/search', {
   $form->header();
 
   print $form->parse_html_template('oe/search', {


@@ -1199,7 +1239,7 @@ sub orders {
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 

-  $report->generate_with_headers();
+  $report->generate_with_headers(action_bar => 1);

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1963,27 +2003,6 @@ sub oe_delivery_order_from_order {
   delivery_order();
 }
 
   delivery_order();
 }
 

-sub e_mail {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  $form->mtime_ischanged('oe','mail');
-  $form->{print_and_save} = 1;
-
-  my $saved_form = save_form();
-
-  save();
-
-  restore_form($saved_form, 0, qw(id ordnumber quonumber));
-
-  edit_e_mail();
-
-  $main::lxdebug->leave_sub();
-}
-

 sub yes {
   call_sub($main::form->{yes_nextsub});
 }
 sub yes {
   call_sub($main::form->{yes_nextsub});
 }


@@ -2198,26 +2217,8 @@ sub _oe_remove_delivered_or_billed_rows {
   _remove_billed_or_delivered_rows(quantities => \%handled_base_qtys);
 }
 
   _remove_billed_or_delivered_rows(quantities => \%handled_base_qtys);
 }
 

-# iterate all positions and match articlenumber
-sub check_transport_cost_reminder_article_number {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id;
-  for my $i (1 .. $form->{rowcount}) {
-    return if $form->{"id_${i}"} eq $transport_article_id;
-  }
-
-  # simply return the name of the part
-  return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber;
-
-  $main::lxdebug->leave_sub();
-}

 sub dispatcher {
 sub dispatcher {

-  foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order quotation
+  foreach my $action (qw(delete delivery_order invoice print purchase_order quotation

                          request_for_quotation sales_order save save_and_close save_as_new ship_to update)) {
     if ($::form->{"action_${action}"}) {
       call_sub($action);
                          request_for_quotation sales_order save save_and_close save_as_new ship_to update)) {
     if ($::form->{"action_${action}"}) {
       call_sub($action);