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',
+ '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;
'id' => { 'text' => $locale->text('ID'), },
"$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor 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);
+ my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault);
$form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
foreach (@columns) {
$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}, $form->{sortdir});
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;
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}) {
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} =