Einkaufs-/Verkaufsprozesse: optionale Einschränkungen für gewisse Aktionen

[mfinanz.git] / bin / mozilla / oe.pl

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index ff759883b2a1ce8f91e7690ec7c47a097125b0e7..12a74464a039cd130fee6a74d638ae4a120f0f63 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -90,6 +90,16 @@ sub check_oe_access {
   $main::auth->assert($right);
 }
 
   $main::auth->assert($right);
 }
 

+sub check_oe_conversion_to_sales_invoice_allowed {
+  return 1 if  $::form->{type} !~ m/^sales/;
+  return 1 if ($::form->{type} =~ m/quotation/) && $::instance_conf->get_allow_sales_invoice_from_sales_quotation;
+  return 1 if ($::form->{type} =~ m/order/)     && $::instance_conf->get_allow_sales_invoice_from_sales_order;
+
+  $::form->show_generic_error($::locale->text("You do not have the permissions to access this function."));
+
+  return 0;
+}
+

 sub set_headings {
   $main::lxdebug->enter_sub();
 
 sub set_headings {
   $main::lxdebug->enter_sub();
 


@@ -321,7 +331,7 @@ sub form_header {
       && $obj->periodic_invoices_config->active
       && (   !$obj->periodic_invoices_config->end_date
           || ($obj->periodic_invoices_config->end_date > DateTime->today_local))
       && $obj->periodic_invoices_config->active
       && (   !$obj->periodic_invoices_config->end_date
           || ($obj->periodic_invoices_config->end_date > DateTime->today_local))

-      && $obj->periodic_invoices_config->get_previous_invoice_date;
+      && $obj->periodic_invoices_config->get_previous_billed_period_start_date;

 
     $TMPL_VAR{oe_obj} = $obj;
   }
 
     $TMPL_VAR{oe_obj} = $obj;
   }


@@ -442,7 +452,7 @@ sub form_header {
     }
   }
 
     }
   }
 

-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details));
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery));

 
   $form->header;
   if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
 
   $form->header;
   if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {


@@ -1313,6 +1323,7 @@ sub invoice {
   my $locale   = $main::locale;
 
   check_oe_access();
   my $locale   = $main::locale;
 
   check_oe_access();

+  check_oe_conversion_to_sales_invoice_allowed();

   $main::auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
 
   $form->{old_salesman_id} = $form->{salesman_id};
   $main::auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
 
   $form->{old_salesman_id} = $form->{salesman_id};