X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLetter.pm;h=25c11f78063e9f9782c4b51e2e1c74c675804773;hb=00b6dc2240564add9114864655e96eb7cc6dde4f;hp=553fe0a86a2dddb0341293a4e4f5acbba5ba117b;hpb=7afe92aff55c96742fbffb54e382f17f9fe4d907;p=kivitendo-erp.git diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 553fe0a86..25c11f780 100644 --- a/SL/Controller/Letter.pm +++ b/SL/Controller/Letter.pm @@ -9,9 +9,11 @@ use POSIX qw(strftime); use SL::Controller::Helper::GetModels; use SL::Controller::Helper::ReportGenerator; use SL::CT; +use SL::DB::Employee; +use SL::DB::Language; use SL::DB::Letter; use SL::DB::LetterDraft; -use SL::DB::Employee; +use SL::DB::Printer; use SL::Helper::Flash qw(flash flash_later); use SL::Helper::CreatePDF; use SL::Helper::PrintOptions; @@ -23,7 +25,7 @@ use SL::Webdav; use SL::Webdav::File; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(letter all_employees models webdav_objects) ], + 'scalar --get_set_init' => [ qw(letter all_employees models webdav_objects is_sales) ], ); __PACKAGE__->run_before('check_auth_edit'); @@ -37,9 +39,12 @@ my %sort_columns = ( subject => t8('Subject'), letternumber => t8('Letternumber'), customer_id => t8('Customer'), + vendor_id => t8('Vendor'), contact => t8('Contact'), ); +### actions + sub action_add { my ($self, %params) = @_; @@ -60,8 +65,10 @@ sub action_edit { return $self->action_add unless $::form->{letter} || $::form->{draft}; - $self->letter(SL::DB::Letter->new_from_draft($::form->{draft}{id})) - if $::form->{draft}; + if ($::form->{draft}) { + $self->letter(SL::DB::Letter->new_from_draft($::form->{draft}{id})); + $self->is_sales($self->letter->is_sales); + } $self->_display( title => t8('Edit Letter'), @@ -94,7 +101,7 @@ sub action_update_contacts { my $letter = $self->letter; - if (!$self->letter->customer_id || !$self->letter->customer) { + if (!$self->letter->has_customer_vendor) { return $self->js ->replaceWith( '#letter_cp_id', @@ -103,12 +110,12 @@ sub action_update_contacts { ->render; } - my $contacts = $letter->customer->contacts; + my $contacts = $letter->customer_vendor->contacts; my $default; if ( $letter->contact && $letter->contact->cp_cv_id - && $letter->contact->cp_cv_id == $letter->customer_id) { + && $letter->contact->cp_cv_id == $letter->customer_vendor_id) { $default = $letter->contact->cp_id; } else { $default = ''; @@ -336,6 +343,8 @@ sub action_send_email { ); } +### internal methods + sub _display { my ($self, %params) = @_; @@ -346,12 +355,13 @@ sub _display { $params{title} ||= t8('Edit Letter'); $::form->{type} = 'letter'; # needed for print_options - $::form->{vc} = 'customer'; # needs to be for _get_contacts... + $::form->{vc} = $letter->is_sales ? 'customer' : 'vendor'; # needs to be for _get_contacts... $::request->layout->add_javascripts('customer_or_vendor_selection.js'); $::request->layout->add_javascripts('edit_part_window.js'); $::form->{language_id} ||= $params{language_id}; + $::form->{languages} ||= SL::DB::Manager::Language->get_all_sorted; $::form->{printers} = SL::DB::Manager::Printer->get_all_sorted; $self->render('letter/edit', @@ -386,8 +396,8 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(date subject letternumber customer_id contact date); - my @sortable = qw(date subject letternumber customer_id contact date); + my @columns = qw(date subject letternumber customer_id vendor_id contact date); + my @sortable = qw(date subject letternumber customer_id vendor_id contact date); my %column_defs = ( date => { text => t8('Date'), sub => sub { $_[0]->date_as_date } }, @@ -395,7 +405,8 @@ sub prepare_report { obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, letternumber => { text => t8('Letternumber'), sub => sub { $_[0]->letternumber }, obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, - customer_id => { text => t8('Customer'), sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name } }, + customer_id => { text => t8('Customer'), sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name }, visible => $self->is_sales }, + vendor_id => { text => t8('Vendor'), sub => sub { SL::DB::Manager::Vendor->find_by_or_create(id => $_[0]->vendor_id)->displayable_name }, visible => !$self->is_sales}, contact => { text => t8('Contact'), sub => sub { $_[0]->contact ? $_[0]->contact->full_name : '' } }, ); @@ -413,10 +424,11 @@ sub prepare_report { $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options(qw(list filter)); + $report->set_export_options(qw(list filter is_sales)); $report->set_options_from_form; $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->add_additional_url_params(is_sales => $self->is_sales); $self->models->finalize; $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); @@ -465,7 +477,11 @@ sub load_letter_draft { return 0 if $params{skip_drafts}; - my $letter_drafts = SL::DB::Manager::LetterDraft->get_all; + my $letter_drafts = SL::DB::Manager::LetterDraft->get_all( + query => [ + SL::DB::Manager::Letter->is_sales_filter($self->is_sales), + ] + ); return unless @$letter_drafts; @@ -552,7 +568,7 @@ sub init_letter { ->assign_attributes(%{ $::form->{letter} }); if ($letter->cp_id) { -# $letter->customer_id($letter->contact->cp_cv_id); +# $letter->customer_vendor_id($letter->contact->cp_cv_id); # contacts don't have language_id yet # $letter->greeting(GenericTranslations->get( # translation_type => 'greetings::' . ($letter->contact->cp_gender eq 'f' ? 'female' : 'male'), @@ -561,6 +577,8 @@ sub init_letter { # )); } + $self->is_sales($letter->is_sales) if $letter->id; + $letter; } @@ -570,6 +588,9 @@ sub init_models { SL::Controller::Helper::GetModels->new( controller => $self, model => 'Letter', + query => [ + SL::DB::Manager::Letter->is_sales_filter($self->is_sales), + ], sorted => \%sort_columns, with_objects => [ 'contact', 'salesman', 'employee' ], ); @@ -600,6 +621,11 @@ sub init_webdav_objects { } @all_objects ]; } +sub init_is_sales { + die 'is_sales must be set' unless defined $::form->{is_sales}; + $::form->{is_sales}; +} + sub check_auth_edit { $::auth->assert('sales_letter_edit'); } @@ -622,14 +648,8 @@ SL::Controller::Letter - Letters CRUD and printing Simple letter CRUD controller with drafting capabilities. -=head1 TODO - - Customer/Vendor switch for dealing with vendor letters - copy to webdav is crap -customer/vendor stuff - =head1 AUTHOR Sven Schöling Es.schoeling@linet-services.deE