projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
task_server: pro Job mit Sprache vom konfiguriert initialisieren
[kivitendo-erp.git]
/
SL
/
Controller
/
CustomerVendor.pm
diff --git
a/SL/Controller/CustomerVendor.pm
b/SL/Controller/CustomerVendor.pm
index
5ea0389
..
91994a1
100644
(file)
--- a/
SL/Controller/CustomerVendor.pm
+++ b/
SL/Controller/CustomerVendor.pm
@@
-69,6
+69,7
@@
sub action_add {
my ($self) = @_;
$self->_pre_render();
my ($self) = @_;
$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')),
$self->render(
'customer_vendor/form',
title => ($self->is_vendor() ? $::locale->text('Add Vendor') : $::locale->text('Add Customer')),
@@
-469,7
+470,8
@@
sub action_get_delivery {
ON p.id = i.parts_id
LEFT JOIN oe
ON p.id = i.parts_id
LEFT JOIN oe
- ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '')
+ ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = ''
+ AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe_vendor_id IS NOT NULL') ." )
${where}
ORDER BY ${arap}.transdate DESC LIMIT 15";
${where}
ORDER BY ${arap}.transdate DESC LIMIT 15";
@@
-550,6
+552,8
@@
sub action_ajaj_customer_autocomplete {
$::form->{column} ? ($::form->{column} => $query) : (or => [ customernumber => $query, name => $query ])
);
$::form->{column} ? ($::form->{column} => $query) : (or => [ customernumber => $query, name => $query ])
);
+ push @filter, (or => [ obsolete => undef, obsolete => 0 ]) if !$::form->{obsolete};
+
my $customers = SL::DB::Manager::Customer->get_all(query => [ @filter ], limit => $limit);
my $value_col = $::form->{column} || 'name';
my $customers = SL::DB::Manager::Customer->get_all(query => [ @filter ], limit => $limit);
my $value_col = $::form->{column} || 'name';
@@
-877,4
+881,15
@@
sub normalize_name {
$self->{cv}->name($name);
}
$self->{cv}->name($name);
}
+sub home_address_for_google_maps {
+ my ($self) = @_;
+
+ my $address = $::instance_conf->get_address // '';
+ $address =~ s{^\s+|\s+$|\r+}{}g;
+ $address =~ s{\n+}{,}g;
+ $address =~ s{\s+}{ }g;
+
+ return $address;
+}
+
1;
1;