X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=ab4401ef8db8f2e68887a9d2858c53ac82c963fb;hb=254ef1b288fe55a17d10468ba776b43661594269;hp=5c0102b39e36843610765e9efc7658e9360f41ef;hpb=f035977341957999d55b1e40db2cbaf7eb516be1;p=kivitendo-erp.git

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 5c0102b39..ab4401ef8 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -9,6 +9,7 @@ use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
 use SL::PriceSource;
 use SL::Webdav;
+use SL::File;
 
 use SL::DB::Order;
 use SL::DB::Default;
@@ -209,7 +210,15 @@ sub action_print {
       $self->js->flash('error', t8('Storing PDF to webdav folder failed: #1', $@));
     }
   }
-
+  if ($self->order->ordnumber && $::instance_conf->get_doc_storage) {
+    SL::File->save(  object_id     => $self->order->id,
+                     object_type   => $self->type,
+                     mime_type     => 'application/pdf',
+                     source        => 'created',
+                     file_type     => 'document',
+                     file_name     => $pdf_filename,
+                     file_contents => $pdf);
+  }
   $self->js->render;
 }
 
@@ -1047,7 +1056,9 @@ sub _pre_render {
   $self->{all_projects}        = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id,
                                                                                       active => 1 ] ],
                                                                    sort_by => 'projectnumber');
-  $self->{all_payment_terms}   = SL::DB::Manager::PaymentTerm->get_all_sorted();
+  $self->{all_payment_terms}   = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id,
+                                                                                                 obsolete => 0 ] ]);
+
   $self->{all_delivery_terms}  = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
@@ -1077,15 +1088,68 @@ sub _pre_render {
       type     => $self->type,
       number   => $self->order->ordnumber,
     );
-    my $webdav_path = $webdav->webdav_path;
     my @all_objects = $webdav->get_all_objects;
     @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename,
                                                     type => t8('File'),
-                                                    link => File::Spec->catdir($webdav_path, $_->filename),
+                                                    link => File::Spec->catfile($_->full_filedescriptor),
                                                 } } @all_objects;
   }
 
-  $::request->{layout}->use_javascript("${_}.js")  for qw(kivi.SalesPurchase kivi.Order ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->{layout}->use_javascript("${_}.js")  for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery);
+  $self->_setup_edit_action_bar;
+}
+
+sub _setup_edit_action_bar {
+  my ($self, %params) = @_;
+
+  my $deletion_allowed = (($self->cv eq 'customer') && $::instance_conf->get_sales_order_show_delete)
+                      || (($self->cv eq 'vendor')   && $::instance_conf->get_purchase_order_show_delete);
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      combobox => [
+        action => [
+          t8('Save'),
+          call      => [ 'kivi.Order.save', $::instance_conf->get_order_warn_duplicate_parts ],
+          accesskey => 'enter',
+        ],
+        action => [
+          t8('Save and Delivery Order'),
+          call      => [ 'kivi.Order.save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ],
+          accesskey => 'enter',
+        ],
+
+      ], # end of combobox "Save"
+
+      combobox => [
+        action => [
+          t8('Export'),
+        ],
+        action => [
+          t8('Print'),
+          call => [ 'kivi.Order.show_print_options' ],
+        ],
+        action => [
+          t8('E-mail'),
+          call => [ 'kivi.Order.email' ],
+        ],
+        action => [
+          t8('Download attachments of all parts'),
+          call     => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ],
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+          only_if  => $::instance_conf->get_doc_storage,
+        ],
+      ], # end of combobox "Export"
+
+      action => [
+        t8('Delete'),
+        call     => [ 'kivi.Order.delete_order' ],
+        confirm  => $::locale->text('Do you really want to delete this object?'),
+        disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+        only_if  => $deletion_allowed,
+      ],
+    );
+  }
 }
 
 sub _create_pdf {
@@ -1284,6 +1348,8 @@ java script functions
 
 =item * price sources: little symbols showing better price / better discount
 
+=item * select units in input row?
+
 =item * custom shipto address
 
 =item * periodic invoices
@@ -1296,12 +1362,15 @@ java script functions
 
 =item * display weights
 
-=item * force project if enabled in client config
-
 =item * history
 
 =item * mtime check
 
+=item * optional client/user behaviour
+
+(transactions has to be set - department has to be set -
+ force project if enabled in client config - transport cost reminder)
+
 =back
 
 =head1 KNOWN BUGS AND CAVEATS
@@ -1339,6 +1408,45 @@ filtering.
 
 =back
 
+=head1 To discuss / Nice to have
+
+=over 4
+
+=item *
+
+How to expand/collapse second row. Now it can be done clicking the icon or
+<shift>-up/down.
+
+=item *
+
+Possibility to change longdescription in input row?
+
+=item *
+
+Possibility to select PriceSources in input row?
+
+=item *
+
+This controller uses a (changed) copy of the template for the PriceSource
+dialog. Maybe there could be used one code source.
+
+=item *
+
+Rounding-differences between this controller (PriceTaxCalculator) and the old
+form. This is not only a problem here, but also in all parts using the PTC.
+There exists a ticket and a patch. This patch should be testet.
+
+=item *
+
+An indicator, if the actual inputs are saved (like in an
+editor or on text processing application).
+
+=item *
+
+A warning when leaving the page without saveing unchanged inputs.
+
+=back
+
 =head1 AUTHOR
 
 Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>