$form->{jsscript} = 1;
$form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
- $form->{fokus} = 'Form.name';
+ $::request->{layout}->focus('#name');
$form->header();
print $form->parse_html_template('ct/search');
$::lxdebug->enter_sub;
$::auth->assert('customer_vendor_edit');
- $::form->{fokus} = 'Form.name';
+ $::form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'Contacts');
+ ($::form->{CUSTOM_VARIABLES_FILTER_CODE},
+ $::form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $::form->{CUSTOM_VARIABLES},
+ 'include_prefix' => 'l.',
+ 'filter_prefix' => 'filter.',
+ 'include_value' => 'Y');
+ $::form->{title} = $::locale->text('Search contacts');
$::form->header;
print $::form->parse_html_template('ct/search_contact');
push @options, $locale->text('Billing/shipping address (city)') . " : $form->{addr_city}" if $form->{addr_city};
push @options, $locale->text('Billing/shipping address (zipcode)') . " : $form->{zipcode}" if $form->{addr_zipcode};
push @options, $locale->text('Billing/shipping address (street)') . " : $form->{street}" if $form->{addr_street};
+ push @options, $locale->text('Billing/shipping address (country)') . " : $form->{country}" if $form->{addr_country};
if ($form->{business_id}) {
my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id});
}
my @columns = (
- 'id', 'name', "$form->{db}number", 'contact', 'phone',
- 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city',
- 'business', 'invnumber', 'ordnumber', 'quonumber'
+ 'id', 'name', "$form->{db}number", 'contact', 'phone',
+ 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city',
+ 'business', 'invnumber', 'ordnumber', 'quonumber', 'salesman', 'country'
);
my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
'street' => { 'text' => $locale->text('Street'), },
'zipcode' => { 'text' => $locale->text('Zipcode'), },
'city' => { 'text' => $locale->text('City'), },
+ 'country' => { 'text' => $locale->text('Country'), },
+ 'salesman' => { 'text' => $locale->text('Salesman'), },
%column_defs_cvars,
);
my @hidden_variables = ( qw(
db status obsolete name contact email cp_name addr_street addr_zipcode
- addr_city business_id
+ addr_city addr_country business_id
), "$form->{db}number",
map({ "cvar_$_->{name}" } @searchable_custom_variables),
+ map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),
map({ "l_$_" } @columns),
);
filter => $::form->{filter},
);
+ my $cvar_configs = CVar->get_configs('module' => 'Contacts');
+
my @columns = qw(
- cp_id vcname vcnumber cp_name cp_givenname cp_street cp_phone1 cp_phone2
- cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_birthday cp_gender
+ cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2 cp_privatphone
+ cp_mobile1 cp_mobile2 cp_fax cp_email cp_privatemail cp_abteilung cp_position cp_birthday cp_gender
);
+ my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
+ my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs };
+ my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
+
+ push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
+
my @visible_columns;
if ($::form->{l}) {
@visible_columns = grep { $::form->{l}{$_} } @columns;
'cp_name' => { 'text' => $::locale->text('Name'), },
'cp_givenname' => { 'text' => $::locale->text('Given Name'), },
'cp_street' => { 'text' => $::locale->text('Street'), },
+ 'cp_zipcode' => { 'text' => $::locale->text('Zipcode'), },
+ 'cp_city' => { 'text' => $::locale->text('City'), },
'cp_phone1' => { 'text' => $::locale->text('Phone1'), },
'cp_phone2' => { 'text' => $::locale->text('Phone2'), },
- 'cp_mobile1' => { 'text' => $::locale->text('Mobile 1'), },
- 'cp_mobile2' => { 'text' => $::locale->text('Mobile 2'), },
+ 'cp_mobile1' => { 'text' => $::locale->text('Mobile1'), },
+ 'cp_mobile2' => { 'text' => $::locale->text('Mobile2'), },
'cp_email' => { 'text' => $::locale->text('E-mail'), },
'cp_abteilung' => { 'text' => $::locale->text('Department'), },
+ 'cp_position' => { 'text' => $::locale->text('Function/position'), },
'cp_birthday' => { 'text' => $::locale->text('Birthday'), },
'cp_gender' => { 'text' => $::locale->text('Gender'), },
+ 'cp_fax' => { 'text' => $::locale->text('Fax'), },
+ 'cp_privatphone' => { 'text' => $::locale->text('Private Phone') },
+ 'cp_privatemail' => { 'text' => $::locale->text('Private E-mail') },
+ %column_defs_cvars,
);
map { $column_defs{$_}->{visible} = 1 } @visible_columns;
my $report = SL::ReportGenerator->new(\%::myconfig, $::form);
- my @options = $::locale->text('Search term') . ': ' . $::form->{search_term};
+ my @options;
+ push @options, $::locale->text('Search term') . ': ' . $::form->{search_term} if $::form->{search_term};
+ for (qw(cp_name cp_givenname cp_title cp_email cp_abteilung cp_project)) {
+ push @options, $column_defs{$_}{text} . ': ' . $::form->{filter}{$_} if $::form->{filter}{$_};
+ }
+ if ($::form->{filter}{status}) {
+ push @options, $::locale->text('Status') . ': ' . (
+ $::form->{filter}{status} =~ /active/ ? $::locale->text('Active') :
+ $::form->{filter}{status} =~ /orphaned/ ? $::locale->text('Orphaned') :
+ $::form->{filter}{status} =~ /all/ ? $::locale->text('All') : ''
+ );
+ }
+
$report->set_options('top_info_text' => join("\n", @options),
'output_format' => 'HTML',
$report->set_sort_indicator($::form->{sort}, $::form->{sortdir});
+ CVar->add_custom_variables_to_report('module' => 'Contacts',
+ 'trans_id_field' => 'cp_id',
+ 'configs' => $cvar_configs,
+ 'column_defs' => \%column_defs,
+ 'data' => \@contacts);
+
+
foreach my $ref (@contacts) {
my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };
$row->{vcname}->{link} = build_std_url('action=edit', 'id=' . E($ref->{vcid}), 'db=' . E($ref->{db}), 'callback', @hidden_nondefault);
$row->{vcnumber}->{link} = $row->{vcname}->{link};
- $row->{cp_email}->{link} = 'mailto:' . E($ref->{cp_email});
+
+ for (qw(cp_email cp_privatemail)) {
+ $row->{$_}->{link} = 'mailto:' . E($ref->{$_}) if $ref->{$_};
+ }
$report->add_data($row);
}
$form->{contacts_label} = \&_contacts_label;
$form->{taxzone_id} = 0 if !$form->{id};
$form->{jsscript} = 1;
- $form->{fokus} = "ct.greeting";
$form->{SHIPTO_ALL} = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ];
+ $::request->{layout}->focus("#greeting");
$form->{title} = $form->{title_save}
|| $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
}
sub _do_save {
- $main::auth->assert('customer_vendor_edit & ' .
- '(general_ledger | invoice_edit | vendor_invoice_edit | ' .
- ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)');
+ $main::auth->assert('customer_vendor_edit');
$::form->isblank("name", $::locale->text("Name missing!"));
projects / kivitendo-erp.git / blobdiff