projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Projekte: benutzerdefinierte Variablen in Suchmaske
[kivitendo-erp.git]
/
SL
/
Controller
/
CustomerVendor.pm
diff --git
a/SL/Controller/CustomerVendor.pm
b/SL/Controller/CustomerVendor.pm
index
a380f43
..
c8fd5fd
100644
(file)
--- a/
SL/Controller/CustomerVendor.pm
+++ b/
SL/Controller/CustomerVendor.pm
@@
-41,7
+41,8
@@
use Rose::Object::MakeMethods::Generic (
__PACKAGE__->run_before(
sub {
$::auth->assert('customer_vendor_edit');
__PACKAGE__->run_before(
sub {
$::auth->assert('customer_vendor_edit');
- }
+ },
+ except => [ qw(ajaj_autocomplete) ],
);
__PACKAGE__->run_before(
'_instantiate_args',
);
__PACKAGE__->run_before(
'_instantiate_args',
@@
-281,7
+282,7
@@
sub _transaction {
my $db = $self->is_vendor() ? 'vendor' : 'customer';
my $action = 'add';
my $db = $self->is_vendor() ? 'vendor' : 'customer';
my $action = 'add';
- if ($::instance_conf->get_feature_experimental && 'oe.pl' eq $script) {
+ if ($::instance_conf->get_feature_experimental
_order
&& 'oe.pl' eq $script) {
$script = 'controller.pl';
$action = 'Order/' . $action;
}
$script = 'controller.pl';
$action = 'Order/' . $action;
}
@@
-585,13
+586,17
@@
sub action_ajaj_get_contact {
}
qw(
id gender abteilung title position givenname name email phone1 phone2 fax mobile1 mobile2
}
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);
)
)
};
$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 });
}
$self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
}
@@
-983,6
+988,7
@@
sub _pre_render {
$::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
$::request->{layout}->add_javascripts('kivi.File.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;
}
$self->_setup_form_action_bar;
}