X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=dccfccbfb1d45a6487c39fcd26e8c0f8ca599c1d;hb=31f989254ce9f2ab881af7aee5d07dd63df0e004;hp=6f5c547e2e6958cff9196b5d53cbdf91b6e96c08;hpb=6f1da6d45bd0b3142876e2bb46acba757ad4e716;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 6f5c547e2..dccfccbfb 100644
--- 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::Vendor;
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/io.pl";
@@ -317,84 +318,141 @@ sub setup_oe_action_bar {
   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')) {
-    $bar->add_actions([ t8('Update'),
-      submit    => [ '#form', { action_update => 1 } ],
-      id        => 'update_button',
-      accesskey => 'enter',
-    ]);
+    $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,
+          only_if  => $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,
+          only_if  => $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,
+          only_if  => $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,
+          only_if  => $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("combobox");
-    $bar->actions->[-1]->add_actions([ t8('Save'),
-      submit  => [ '#form', { action_save => 1 } ],
-      checks  => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ],
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Save as new'),
-      submit   => [ '#form', { action_save_as_new => 1 } ],
-      checks   => [ @req_trans_desc, @req_trans_cost_art ],
-      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, @req_trans_cost_art, @warn_p_invoice ],
-    ]);
-    $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,
-    ]);
+sub setup_oe_search_action_bar {
+  my %params = @_;
 
-    $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,
-    ]);
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Search'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
 
-    $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,
-    ]);
+sub setup_oe_orders_action_bar {
+  my %params = @_;
+
+  return unless $::form->{type} eq 'sales_order';
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('New sales order'),
+        submit    => [ '#form', { action => 'edit' } ],
+        checks    => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ],
+        accesskey => 'enter',
+      ],
+    );
   }
 }
 
@@ -415,6 +473,8 @@ sub form_header {
   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);
 
@@ -554,12 +614,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->{$_} },
-     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
-        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
@@ -646,9 +705,11 @@ sub form_footer {
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
+  my $print_options_html = setup_sales_purchase_print_options();
+
   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,
-     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$/),
@@ -869,6 +930,8 @@ sub search {
 
   $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project));
 
+  setup_oe_search_action_bar();
+
   $form->header();
 
   print $form->parse_html_template('oe/search', {
@@ -1116,7 +1179,7 @@ sub orders {
 
   $report->set_options('top_info_text'        => join("\n", @options),
                        'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),
-                       'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }),
+                       'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'),
                        'output_format'        => 'HTML',
                        'title'                => $form->{title},
                        'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
@@ -1197,7 +1260,8 @@ sub orders {
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-  $report->generate_with_headers();
+  setup_oe_orders_action_bar();
+  $report->generate_with_headers(action_bar => 1);
 
   $main::lxdebug->leave_sub();
 }
@@ -1961,27 +2025,6 @@ sub oe_delivery_order_from_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});
 }
@@ -2197,7 +2240,7 @@ sub _oe_remove_delivered_or_billed_rows {
 }
 
 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);