$auth->assert('customer_vendor_edit');
- $form->{title} = "Add";
-
- $form->{callback} =
- "$form->{script}?action=add&db=$form->{db}"
- unless $form->{callback};
+ $form->{title} = "Add";
+ $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback};
CT->populate_drop_down_boxes(\%myconfig, \%$form);
$form->{IS_CUSTOMER} = $form->{db} eq 'customer';
+ report_generator_set_default_sort('name', 1);
+
CT->search(\%myconfig, \%$form);
my $cvar_configs = CVar->get_configs('module' => 'CT');
push @options, $locale->text('Orphaned');
}
- push @options, $locale->text('Name') . " : $form->{name}" if $form->{name};
- push @options, $locale->text('Contact') . " : $form->{contact}" if $form->{contact};
- push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"};
- push @options, $locale->text('E-mail') . " : $form->{email}" if $form->{email};
+ push @options, $locale->text('Name') . " : $form->{name}" if $form->{name};
+ push @options, $locale->text('Contact') . " : $form->{contact}" if $form->{contact};
+ push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"};
+ push @options, $locale->text('E-mail') . " : $form->{email}" if $form->{email};
+ push @options, $locale->text('Contact person (surname)') . " : $form->{cp_name}" if $form->{cp_name};
+ 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};
my @columns = (
- 'id', 'name', "$form->{db}number", 'address', 'contact', 'phone',
- 'fax', 'email', 'taxnumber', 'sic_code', 'business', 'invnumber',
- 'ordnumber', 'quonumber'
+ 'id', 'name', "$form->{db}number", 'contact', 'phone',
+ 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city',
+ 'business', 'invnumber', 'ordnumber', 'quonumber'
);
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 %column_defs = (
'id' => { 'text' => $locale->text('ID'), },
- "$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
+ "$form->{db}number" => { 'text' => $locale->text('Number'), },
'name' => { 'text' => $locale->text('Name'), },
- 'address' => { 'text' => $locale->text('Address'), },
'contact' => { 'text' => $locale->text('Contact'), },
'phone' => { 'text' => $locale->text('Phone'), },
'fax' => { 'text' => $locale->text('Fax'), },
'email' => { 'text' => $locale->text('E-mail'), },
'cc' => { 'text' => $locale->text('Cc'), },
'taxnumber' => { 'text' => $locale->text('Tax Number'), },
- 'sic_code' => { 'text' => $locale->text('SIC'), },
'business' => { 'text' => $locale->text('Type of Business'), },
'invnumber' => { 'text' => $locale->text('Invoice'), },
'ordnumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Sales Order') : $locale->text('Purchase Order'), },
'quonumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Quotation') : $locale->text('Request for Quotation'), },
+ 'street' => { 'text' => $locale->text('Street'), },
+ 'zipcode' => { 'text' => $locale->text('Zipcode'), },
+ 'city' => { 'text' => $locale->text('City'), },
%column_defs_cvars,
);
map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
- my @hidden_variables = (qw(db status obsolete), map { "l_$_" } @columns);
+ my @hidden_variables = (qw(db status obsolete name contact email cp_name addr_city), "$form->{db}number", @searchable_custom_variables, map { "l_$_" } @columns);
my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
- my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables);
- $form->{callback} = "$callback&sort=" . E($form->{sort});
+ my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault);
+ $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
- map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns;
+ foreach (@columns) {
+ my $sortdir = $form->{sort} eq $_ ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$_}->{link} = "${callback}&sort=${_}&sortdir=${sortdir}";
+ }
my ($ordertype, $quotationtype, $attachment_basename);
if ($form->{IS_CUSTOMER}) {
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('list_names', @hidden_variables);
+ $report->set_export_options('list_names', @hidden_variables, qw(sort sortdir));
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
CVar->add_custom_variables_to_report('module' => 'CT',
'trans_id_field' => 'id',
# show history button
$form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
#/show hhistory button
-
+
CT->get_tuple(\%myconfig, \%$form);
CT->populate_drop_down_boxes(\%myconfig, \%$form);
- # format " into "
- map { $form->{$_} =~ s/\"/"/g } keys %$form;
-
$form->{title} = "Edit";
# format discount
$form->{is_admin} = $myconfig{role} eq 'admin';
$form->{is_customer} = $form->{db} eq 'customer';
$form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
- $form->{shipto_label} = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
+ $form->{shipto_label} = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' };
$form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
$form->{taxzone_id} = 0 if !$form->{id};
$form->{jsscript} = 1;
unshift @{ $form->{SHIPTO} }, +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' };
unshift @{ $form->{CONTACTS} }, +{ cp_id => '0', cp_name => $locale->text('New contact') };
- $form->{title} = $form->{title_save}
+ $form->{title} = $form->{title_save}
|| $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
CT->query_titles_and_greetings(\%myconfig, \%$form);
sub add_transaction {
$lxdebug->enter_sub();
- $auth->assert('customer_vendor_edit & general_ledger');
+ $auth->assert('customer_vendor_edit & ' .
+ '(general_ledger | invoice_edit | vendor_invoice_edit | ' .
+ ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)');
# # saving the history
# if(!exists $form->{addition}) {
# $form->save_history($form->dbconnect(\%myconfig));
# }
# # /saving the history
-
+
$form->isblank("name", $locale->text("Name missing!"));
if ($form->{"db"} eq "customer") {
CT->save_customer(\%myconfig, \%$form);
sub save_and_order {
$lxdebug->enter_sub();
- $auth->assert('customer_vendor_edit & sales_order_edit');
+ if ($form->{db} eq 'customer') {
+ $auth->assert('customer_vendor_edit & sales_order_edit');
+ } else {
+ $auth->assert('customer_vendor_edit & purchase_order_edit');
+ }
$form->{script} = "oe.pl";
$form->{type} =
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
$form->redirect($locale->text($msg));
$msg = "Cannot delete $form->{db}";
$auth->assert('customer_vendor_edit');
CT->get_contact(\%myconfig, \%$form);
- print $cgi->header(), join '__pjx__', map $form->{"cp_$_"},
- qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday);
+ print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"},
+ qw(name title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used gender);
$lxdebug->leave_sub();
}
$auth->assert('customer_vendor_edit');
CT->get_shipto(\%myconfig, \%$form);
- print $cgi->header(), join '__pjx__', map $form->{"shipto$_"},
+ print $form->ajax_response_header(), join '__pjx__', map $form->{"shipto$_"},
qw(name department_1 department_2 street zipcode city country contact phone fax email used);
$lxdebug->leave_sub();
$auth->assert('customer_vendor_edit');
CT->get_delivery(\%myconfig, \%$form );
+ $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
- print $cgi->header(), $form->parse_html_template('ct/get_delivery');
+ print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');
$lxdebug->leave_sub();
}
+sub delete_shipto {
+ $main::lxdebug->enter_sub();
+
+ $auth->assert('customer_vendor_edit');
+
+ CT->get_shipto(\%myconfig, \%$form);
+
+ unless ($form->{shiptoused}) {
+ CT->delete_shipto($form->{shipto_id});
+ @$form{ grep /^shipto/, keys %$form } = undef;
+ }
+
+ edit();
+
+ $main::lxdebug->leave_sub();
+}
+
+sub delete_contact {
+ $main::lxdebug->enter_sub();
+
+ $auth->assert('customer_vendor_edit');
+
+ CT->get_contact(\%myconfig, \%$form);
+
+ unless ($form->{cp_used}) {
+ CT->delete_shipto($form->{cp_id});
+ @$form{ grep /^cp_/, keys %$form } = undef;
+ }
+
+ edit();
+
+ $main::lxdebug->leave_sub();
+}
+
sub continue { call_sub($form->{nextsub}); }
projects / kivitendo-erp.git / blobdiff