X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendor.pm;h=e8f1c5a4a0e7e2729524d00ae4c225ef6e7ab311;hb=4dc48e117cfdb6e59c2d8b9d8087ef8a3bc245a4;hp=2e8b2f5a0478345691c5bbdd9357553b8a6fe346;hpb=e48eb4dc7e721dbdf15417167e9320fd12decf69;p=kivitendo-erp.git diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm index 2e8b2f5a0..e8f1c5a4a 100644 --- a/SL/Controller/CustomerVendor.pm +++ b/SL/Controller/CustomerVendor.pm @@ -9,32 +9,47 @@ use SL::JSON; use SL::DBUtils; use SL::Helper::Flash; use SL::Locale::String; +use SL::Util qw(trim); +use SL::Webdav; +use SL::ZUGFeRD; use SL::Controller::Helper::GetModels; +use SL::Controller::Helper::ReportGenerator; +use SL::Controller::Helper::ParseFilter; use SL::DB::Customer; use SL::DB::Vendor; use SL::DB::Business; +use SL::DB::ContactDepartment; +use SL::DB::ContactTitle; use SL::DB::Employee; +use SL::DB::Greeting; use SL::DB::Language; use SL::DB::TaxZone; use SL::DB::Note; use SL::DB::PaymentTerm; use SL::DB::Pricegroup; +use SL::DB::Price; use SL::DB::Contact; use SL::DB::FollowUp; use SL::DB::FollowUpLink; use SL::DB::History; use SL::DB::Currency; +use SL::DB::Invoice; +use SL::DB::PurchaseInvoice; +use SL::DB::Order; + +use Data::Dumper; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(customer_models vendor_models) ], + 'scalar --get_set_init' => [ qw(customer_models vendor_models zugferd_settings) ], ); # safety __PACKAGE__->run_before( sub { $::auth->assert('customer_vendor_edit'); - } + }, + except => [ qw(ajaj_autocomplete) ], ); __PACKAGE__->run_before( '_instantiate_args', @@ -61,6 +76,7 @@ __PACKAGE__->run_before( 'update', 'ajaj_get_shipto', 'ajaj_get_contact', + 'ajax_list_prices', ] ); @@ -101,6 +117,7 @@ sub action_add { $self->_pre_render(); $self->{cv}->assign_attributes(hourly_rate => $::instance_conf->get_customer_hourly_rate) if $self->{cv}->is_customer; + $self->render( 'customer_vendor/form', title => ($self->is_vendor() ? $::locale->text('Add Vendor') : $::locale->text('Add Customer')), @@ -150,6 +167,21 @@ sub _save { $::dispatcher->end_request; } + $self->{cv}->greeting(trim $self->{cv}->greeting); + my $save_greeting = $self->{cv}->greeting + && $::instance_conf->get_vc_greetings_use_textfield + && SL::DB::Manager::Greeting->get_all_count(where => [description => $self->{cv}->greeting]) == 0; + + $self->{contact}->cp_title(trim($self->{contact}->cp_title)); + my $save_contact_title = $self->{contact}->cp_title + && $::instance_conf->get_contact_titles_use_textfield + && SL::DB::Manager::ContactTitle->get_all_count(where => [description => $self->{contact}->cp_title]) == 0; + + $self->{contact}->cp_abteilung(trim($self->{contact}->cp_abteilung)); + my $save_contact_department = $self->{contact}->cp_abteilung + && $::instance_conf->get_contact_departments_use_textfield + && SL::DB::Manager::ContactDepartment->get_all_count(where => [description => $self->{contact}->cp_abteilung]) == 0; + my $db = $self->{cv}->db; $db->with_transaction(sub { @@ -175,8 +207,13 @@ sub _save { $self->{cv}->save(cascade => 1); + SL::DB::Greeting->new(description => $self->{cv}->greeting)->save if $save_greeting; + $self->{contact}->cp_cv_id($self->{cv}->id); if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) { + SL::DB::ContactTitle ->new(description => $self->{contact}->cp_title) ->save if $save_contact_title; + SL::DB::ContactDepartment->new(description => $self->{contact}->cp_abteilung)->save if $save_contact_department; + $self->{contact}->save(cascade => 1); } @@ -271,10 +308,16 @@ sub _transaction { my $name = $::form->escape($self->{cv}->name, 1); my $db = $self->is_vendor() ? 'vendor' : 'customer'; + my $action = 'add'; + + if ($::instance_conf->get_feature_experimental_order && 'oe.pl' eq $script) { + $script = 'controller.pl'; + $action = 'Order/' . $action; + } my $url = $self->url_for( controller => $script, - action => 'add', + action => $action, vc => $db, $db .'_id' => $self->{cv}->id, $db => $name, @@ -459,11 +502,11 @@ sub action_search_contact { print $::form->redirect_header($url); } - sub action_get_delivery { my ($self) = @_; - $::auth->assert('sales_all_edit'); + $::auth->assert('sales_all_edit') if $self->is_customer(); + $::auth->assert('purchase_all_edit') if $self->is_vendor(); my $dbh = $::form->get_standard_dbh(); @@ -572,13 +615,17 @@ sub action_ajaj_get_contact { } qw( id gender abteilung title position givenname name email phone1 phone2 fax mobile1 mobile2 - satphone satfax project street zipcode city privatphone privatemail birthday + satphone satfax project street zipcode city privatphone privatemail birthday main ) ) }; $data->{contact_cvars} = $self->_prepare_cvar_configs_for_ajaj($self->{contact}->cvars_by_config); + # avoid two or more main_cp + my $has_main_cp = grep { $_->cp_main == 1 } @{ $self->{cv}->contacts }; + $data->{contact}->{disable_cp_main} = 1 if ($has_main_cp && !$data->{contact}->{cp_main}); + $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 }); } @@ -601,8 +648,8 @@ sub action_ajaj_autocomplete { } # if someone types something, and hits enter, assume he entered the full name. - # if something matches, treat that as sole match - # unfortunately get_models can't do more than one per package atm, so we d it + # if something matches, treat that as the sole match + # unfortunately get_models can't do more than one per package atm, so we do it # the oldfashioned way. if ($::form->{prefer_exact}) { my $exact_matches; @@ -639,10 +686,65 @@ sub action_ajaj_autocomplete { } sub action_test_page { - $::request->{layout}->add_javascripts('autocomplete_customer.js'); $_[0]->render('customer_vendor/test_page'); } +sub action_ajax_list_prices { + my ($self, %params) = @_; + + my $report = SL::ReportGenerator->new(\%::myconfig, $::form); + my @columns = qw(partnumber description price); + my @visible = qw(partnumber description price); + my @sortable = qw(partnumber description price); + + my %column_defs = ( + partnumber => { text => $::locale->text('Part Number'), sub => sub { $_[0]->parts->partnumber } }, + description => { text => $::locale->text('Part Description'), sub => sub { $_[0]->parts->description } }, + price => { text => $::locale->text('Price'), sub => sub { $::form->format_amount(\%::myconfig, $_[0]->price, 2) }, align => 'right' }, + ); + + $::form->{sort_by} ||= 'partnumber'; + $::form->{sort_dir} //= 1; + + for my $col (@sortable) { + $column_defs{$col}{link} = $self->url_for( + action => 'ajax_list_prices', + callback => $::form->{callback}, + db => $::form->{db}, + id => $self->{cv}->id, + sort_by => $col, + sort_dir => ($::form->{sort_by} eq $col ? 1 - $::form->{sort_dir} : $::form->{sort_dir}) + ); + } + + map { $column_defs{$_}{visible} = 1 } @visible; + + my $pricegroup; + $pricegroup = $self->{cv}->pricegroup->pricegroup if $self->{cv}->pricegroup; + + $report->set_columns(%column_defs); + $report->set_column_order(@columns); + $report->set_options(allow_pdf_export => 0, allow_csv_export => 0); + $report->set_sort_indicator($::form->{sort_by}, $::form->{sort_dir}); + $report->set_export_options(@{ $params{report_generator_export_options} || [] }); + $report->set_options( + %{ $params{report_generator_options} || {} }, + output_format => 'HTML', + top_info_text => $::locale->text('Pricegroup') . ': ' . $pricegroup, + title => $::locale->text('Price List'), + ); + + my $sort_param = $::form->{sort_by} eq 'price' ? 'price' : + $::form->{sort_by} eq 'description' ? 'parts.description' : + 'parts.partnumber'; + $sort_param .= ' ' . ($::form->{sort_dir} ? 'ASC' : 'DESC'); + my $prices = SL::DB::Manager::Price->get_all(where => [ pricegroup_id => $self->{cv}->pricegroup_id ], + sort_by => $sort_param, + with_objects => 'parts'); + + $self->report_generator_list_objects(report => $report, objects => $prices, layout => 0, header => 0); +} + sub is_vendor { return $::form->{db} eq 'vendor'; } @@ -846,33 +948,24 @@ sub _pre_render { $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); - $query = - 'SELECT DISTINCT(greeting) - FROM customer - WHERE greeting IS NOT NULL AND greeting != \'\' - UNION - SELECT DISTINCT(greeting) - FROM vendor - WHERE greeting IS NOT NULL AND greeting != \'\' - ORDER BY greeting'; - $self->{all_greetings} = [ - map( - { $_->{greeting}; } - selectall_hashref_query($::form, $dbh, $query) - ) - ]; - - $query = - 'SELECT DISTINCT(cp_title) AS title - FROM contacts - WHERE cp_title IS NOT NULL AND cp_title != \'\' - ORDER BY cp_title'; - $self->{all_titles} = [ - map( - { $_->{title}; } - selectall_hashref_query($::form, $dbh, $query) - ) - ]; + $self->{all_greetings} = SL::DB::Manager::Greeting->get_all_sorted(); + if ($self->{cv}->id && $self->{cv}->greeting && !grep {$self->{cv}->greeting eq $_->description} @{$self->{all_greetings}}) { + unshift @{$self->{all_greetings}}, (SL::DB::Greeting->new(description => $self->{cv}->greeting)); + } + + $self->{all_contact_titles} = SL::DB::Manager::ContactTitle->get_all_sorted(); + foreach my $contact (@{ $self->{cv}->contacts }) { + if ($contact->cp_title && !grep {$contact->cp_title eq $_->description} @{$self->{all_contact_titles}}) { + unshift @{$self->{all_contact_titles}}, (SL::DB::ContactTitle->new(description => $contact->cp_title)); + } + } + + $self->{all_contact_departments} = SL::DB::Manager::ContactDepartment->get_all_sorted(); + foreach my $contact (@{ $self->{cv}->contacts }) { + if ($contact->cp_abteilung && !grep {$contact->cp_abteilung eq $_->description} @{$self->{all_contact_departments}}) { + unshift @{$self->{all_contact_departments}}, (SL::DB::ContactDepartment->new(description => $contact->cp_abteilung)); + } + } $self->{all_currencies} = SL::DB::Manager::Currency->get_all(); @@ -901,23 +994,14 @@ sub _pre_render { $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id, deleted => 0 ] ]); } - $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all(); + $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->{cv}->payment_id, + obsolete => 0 ] ]); $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all(); - $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]); - - $query = - 'SELECT DISTINCT(cp_abteilung) AS department - FROM contacts - WHERE cp_abteilung IS NOT NULL AND cp_abteilung != \'\' - ORDER BY cp_abteilung'; - $self->{all_departments} = [ - map( - { $_->{department}; } - selectall_hashref_query($::form, $dbh, $query) - ) - ]; + if ($self->{cv}->is_customer) { + $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]); + } $self->{contacts} = $self->{cv}->contacts; $self->{contacts} ||= []; @@ -933,10 +1017,132 @@ sub _pre_render { with_objects => ['follow_up'], ); + if ( $self->is_vendor()) { + $self->{open_items} = SL::DB::Manager::PurchaseInvoice->get_all_count( + query => [ + vendor_id => $self->{cv}->id, + paid => {lt_sql => 'amount'}, + ], + ); + } else { + $self->{open_items} = SL::DB::Manager::Invoice->get_all_count( + query => [ + customer_id => $self->{cv}->id, + paid => {lt_sql => 'amount'}, + ], + ); + } + + if ( $self->is_vendor() ) { + $self->{open_orders} = SL::DB::Manager::Order->get_all_count( + query => [ + vendor_id => $self->{cv}->id, + closed => 'F', + ], + ); + } else { + $self->{open_orders} = SL::DB::Manager::Order->get_all_count( + query => [ + customer_id => $self->{cv}->id, + closed => 'F', + ], + ); + } + + if ($self->{cv}->number && $::instance_conf->get_webdav) { + my $webdav = SL::Webdav->new( + type => $self->is_customer ? 'customer' + : $self->is_vendor ? 'vendor' + : undef, + number => $self->{cv}->number, + ); + my @all_objects = $webdav->get_all_objects; + @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename, + type => t8('File'), + link => File::Spec->catfile($_->full_filedescriptor), + } } @all_objects; + } + $self->{template_args} ||= {}; - $::request->{layout}->add_javascripts('autocomplete_customer.js'); $::request->{layout}->add_javascripts('kivi.CustomerVendor.js'); + $::request->{layout}->add_javascripts('kivi.File.js'); + $::request->{layout}->add_javascripts('kivi.CustomerVendorTurnover.js'); + + $self->_setup_form_action_bar; +} + +sub _setup_form_action_bar { + my ($self) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + combobox => [ + action => [ + t8('Save'), + submit => [ '#form', { action => "CustomerVendor/save" } ], + checks => [ 'check_taxzone_and_ustid' ], + accesskey => 'enter', + ], + action => [ + t8('Save and Close'), + submit => [ '#form', { action => "CustomerVendor/save_and_close" } ], + checks => [ 'check_taxzone_and_ustid' ], + ], + ], # end of combobox "Save" + + combobox => [ + action => [ t8('Workflow') ], + (action => [ + t8('Save and AP Transaction'), + submit => [ '#form', { action => "CustomerVendor/save_and_ap_transaction" } ], + checks => [ 'check_taxzone_and_ustid' ], + ]) x !!$self->is_vendor, + (action => [ + t8('Save and AR Transaction'), + submit => [ '#form', { action => "CustomerVendor/save_and_ar_transaction" } ], + checks => [ 'check_taxzone_and_ustid' ], + ]) x !$self->is_vendor, + action => [ + t8('Save and Invoice'), + submit => [ '#form', { action => "CustomerVendor/save_and_invoice" } ], + checks => [ 'check_taxzone_and_ustid' ], + ], + action => [ + t8('Save and Order'), + submit => [ '#form', { action => "CustomerVendor/save_and_order" } ], + checks => [ 'check_taxzone_and_ustid' ], + ], + (action => [ + t8('Save and RFQ'), + submit => [ '#form', { action => "CustomerVendor/save_and_rfq" } ], + checks => [ 'check_taxzone_and_ustid' ], + ]) x !!$self->is_vendor, + (action => [ + t8('Save and Quotation'), + submit => [ '#form', { action => "CustomerVendor/save_and_quotation" } ], + checks => [ 'check_taxzone_and_ustid' ], + ]) x !$self->is_vendor, + ], # end of combobox "Workflow" + + action => [ + t8('Delete'), + submit => [ '#form', { action => "CustomerVendor/delete" } ], + confirm => t8('Do you really want to delete this object?'), + disabled => !$self->{cv}->id ? t8('This object has not been saved yet.') + : !$self->is_orphaned ? t8('This object has already been used.') + : undef, + ], + + 'separator', + + action => [ + t8('History'), + call => [ 'kivi.CustomerVendor.showHistoryWindow', $self->{cv}->id ], + disabled => !$self->{cv}->id ? t8('This object has not been saved yet.') : undef, + ], + ); + } } sub _prepare_cvar_configs_for_ajaj { @@ -1030,6 +1236,13 @@ sub init_vendor_models { ); } +sub init_zugferd_settings { + return [ + [ -1, t8('Use settings from client configuration') ], + @SL::ZUGFeRD::customer_settings, + ], +} + sub _new_customer_vendor_object { my ($self) = @_;