X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0b84f51fd598e4b5a1cb139aa582297d089b1602..abaf49cca1f299eb7a45f5ef4f8162ede6b642d7:/SL/Controller/CustomerVendor.pm

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index b2e32e6fa..e27b3618e 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -101,6 +101,7 @@ sub action_add {
 
   $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')),
@@ -263,7 +264,8 @@ sub action_save_and_close {
 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();
@@ -287,7 +289,7 @@ sub _transaction {
 sub action_save_and_ar_transaction {
   my ($self) = @_;
 
-  $main::auth->assert('general_ledger');
+  $main::auth->assert('ar_transactions');
 
   $self->_transaction('ar.pl');
 }
@@ -295,7 +297,7 @@ sub action_save_and_ar_transaction {
 sub action_save_and_ap_transaction {
   my ($self) = @_;
 
-  $main::auth->assert('general_ledger');
+  $main::auth->assert('ap_transactions');
 
   $self->_transaction('ap.pl');
 }
@@ -900,11 +902,14 @@ sub _pre_render {
     $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id,  deleted => 0 ] ]);
   }
 
-  $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all();
+  $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id       => $self->{cv}->payment_id,
+                                                                                               obsolete => 0 ] ]);
 
   $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
@@ -936,6 +941,57 @@ sub _pre_render {
 
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
   $::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
+  $::request->{layout}->add_javascripts('kivi.File.js');
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add_actions("combobox");
+    $bar->actions->[-1]->add_actions([ t8('Save'),
+      submit => [ '#form', { action_save           => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+     $bar->actions->[-1]->add_actions([ t8('Save and Close'),
+      submit => [ '#form', { action_save_and_close => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->add_actions('combobox');
+    $bar->actions->[-1]->add_actions([ t8('Workflow'),
+      disabled => 1,
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and AP Transaction'),
+      submit => [ '#form', { action_save_and_ap_transaction => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if $self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and AR Transaction'),
+      submit => [ '#form', { action_save_and_ar_transaction => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if !$self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and Invoice'),
+      submit => [ '#form', { action_save_and_invoice => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and Order'),
+      submit => [ '#form', { action_save_and_order => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]);
+    $bar->actions->[-1]->add_actions([ t8('Save and RFQ'),
+      submit => [ '#form', { action_save_and_rfq => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if $self->is_vendor;
+    $bar->actions->[-1]->add_actions([ t8('Save and Quotation'),
+      submit => [ '#form', { action_save_and_quotation => 1 } ],
+      checks => [ 'check_taxzone_and_ustid' ],
+    ]) if !$self->is_vendor;
+    $bar->add_actions([ t8('Delete'),
+      submit => [ '#form', { action_delete         => 1 } ],
+      confirm => t8('Do you really want to delete this object?'),
+      disabled => !$self->{cv}->id || !$self->is_orphaned,
+    ]);
+    $bar->add_actions('separator');
+    $bar->add_actions([ t8('History'),
+      call     => [ 'kivi.CustomerVendor.showHistoryWindow', $self->{cv}->id ],
+      disabled => !$self->{cv}->id,
+    ]);
+  }
 }
 
 sub _prepare_cvar_configs_for_ajaj {