X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/359506e56c71e419ac82c2adf0de22cfd6d59cfa..fdebfd5d0c558cb156849b01c9c9268b29dc443b:/SL/Controller/Order.pm diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 82b8a2ab0..8355dda14 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -4,11 +4,12 @@ use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); -use SL::Presenter; +use SL::Presenter::Tag qw(select_tag); 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,20 @@ sub action_print { $self->js->flash('error', t8('Storing PDF to webdav folder failed: #1', $@)); } } - + if ($self->order->ordnumber && $::instance_conf->get_doc_storage) { + eval { + 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); + 1; + } or do { + $self->js->flash('error', t8('Storing PDF in storage backend failed: #1', $@)); + } + } $self->js->render; } @@ -352,6 +366,7 @@ sub action_customer_vendor_changed { $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked) ? $self->order->$cv_method->taxincluded_checked : $::myconfig{taxincluded_checked}); + $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id); } $self->order->payment_id($self->order->$cv_method->payment_id); @@ -503,7 +518,7 @@ sub action_add_multi_items { # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount $item->discount(1) unless $assortment_item->charge; - push @items, $assortment_item; + push @items, $item; } } } @@ -757,12 +772,12 @@ sub _check_auth { sub build_contact_select { my ($self) = @_; - $self->p->select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ], - value_key => 'cp_id', - title_key => 'full_name_dep', - default => $self->order->cp_id, - with_empty => 1, - style => 'width: 300px', + select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ], + value_key => 'cp_id', + title_key => 'full_name_dep', + default => $self->order->cp_id, + with_empty => 1, + style => 'width: 300px', ); } @@ -772,12 +787,12 @@ sub build_contact_select { sub build_shipto_select { my ($self) = @_; - $self->p->select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ], - value_key => 'shipto_id', - title_key => 'displayable_id', - default => $self->order->shipto_id, - with_empty => 1, - style => 'width: 300px', + select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ], + value_key => 'shipto_id', + title_key => 'displayable_id', + default => $self->order->shipto_id, + with_empty => 1, + style => 'width: 300px', ); } @@ -1047,7 +1062,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,7 +1094,6 @@ 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'), @@ -1085,7 +1101,60 @@ sub _pre_render { } } @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 ], + ], + + ], # 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 +1353,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 @@ -1292,16 +1363,17 @@ java script functions =item * access rights -=item * preset salesman from customer - =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 @@ -1313,6 +1385,8 @@ java script functions Customer discount is not displayed as a valid discount in price source popup (this might be a bug in price sources) +(I cannot reproduce this (Bernd)) + =item * No indication that -up/down expands/collapses second row. @@ -1339,6 +1413,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 +-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 Ebernd@kivitendo-premium.deE