projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: CTI-Test gefixt
[kivitendo-erp.git]
/
SL
/
Controller
/
CustomerVendor.pm
diff --git
a/SL/Controller/CustomerVendor.pm
b/SL/Controller/CustomerVendor.pm
index
b2e32e6
..
325fa58
100644
(file)
--- a/
SL/Controller/CustomerVendor.pm
+++ b/
SL/Controller/CustomerVendor.pm
@@
-263,7
+263,8
@@
sub action_save_and_close {
sub _transaction {
my ($self, $script) = @_;
sub _transaction {
my ($self, $script) = @_;
- $::auth->assert('general_ledger | invoice_edit | vendor_invoice_edit | ' .
+ $::auth->assert('gl_transactions | ap_transactions | ar_transactions'.
+ '| invoice_edit | vendor_invoice_edit | ' .
' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit');
$self->_save();
' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit');
$self->_save();
@@
-287,7
+288,7
@@
sub _transaction {
sub action_save_and_ar_transaction {
my ($self) = @_;
sub action_save_and_ar_transaction {
my ($self) = @_;
- $main::auth->assert('
general_ledger
');
+ $main::auth->assert('
ar_transactions
');
$self->_transaction('ar.pl');
}
$self->_transaction('ar.pl');
}
@@
-295,7
+296,7
@@
sub action_save_and_ar_transaction {
sub action_save_and_ap_transaction {
my ($self) = @_;
sub action_save_and_ap_transaction {
my ($self) = @_;
- $main::auth->assert('
general_ledger
');
+ $main::auth->assert('
ap_transactions
');
$self->_transaction('ap.pl');
}
$self->_transaction('ap.pl');
}
@@
-904,7
+905,9
@@
sub _pre_render {
$self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all();
$self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all();
- $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all();
+ if ($self->{cv}->is_customer) {
+ $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]);
+ }
$query =
'SELECT DISTINCT(cp_abteilung) AS department
$query =
'SELECT DISTINCT(cp_abteilung) AS department