Auftrags-Controller: als experimentelles Feature abschaltbar.

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f11970d0de6060602d95c9d7b52dc57d91a016a2..e49e462f370a4e284b71298f021d0fa6598a1d61 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1017,7 +1017,7 @@ sub orders {
   $form->{l_open}              = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});
   $form->{l_delivered}         = "Y"                     if ($form->{delivered} && $form->{notdelivered});
   $form->{l_periodic_invoices} = "Y"                     if ($form->{periodic_invoices_active} && $form->{periodic_invoices_inactive});
   $form->{l_open}              = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});
   $form->{l_delivered}         = "Y"                     if ($form->{delivered} && $form->{notdelivered});
   $form->{l_periodic_invoices} = "Y"                     if ($form->{periodic_invoices_active} && $form->{periodic_invoices_inactive});

-  $form->{l_edit_exp}          = "Y"                     if (any { $form->{type} eq $_ } qw(sales_order purchase_order));
+  $form->{l_edit_exp}          = "Y"                     if $::instance_conf->get_feature_experimental && (any { $form->{type} eq $_ } qw(sales_order purchase_order));

   map { $form->{"l_${_}"} = 'Y' } qw(order_probability expected_billing_date expected_netamount) if $form->{l_order_probability_expected_billing_date};
 
   my $attachment_basename;
   map { $form->{"l_${_}"} = 'Y' } qw(order_probability expected_billing_date expected_netamount) if $form->{l_order_probability_expected_billing_date};
 
   my $attachment_basename;

diff --git a/locale/de/all b/locale/de/all
index 563e5eb6a5508a935bcd4101749cdfe97ca1e7f5..f7b950ca254420504e15d97605479d8886c295c8 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3746,6 +3746,7 @@ $self->{texts} = {
   'monthly'                     => 'monatlich',
   'more'                        => 'mehr',
   'never'                       => 'niemals',
   'monthly'                     => 'monatlich',
   'more'                        => 'mehr',
   'never'                       => 'niemals',

+  'new order controller'        => 'Neuer Auftrags-Controller',

   'next'                        => 'vor',
   'no'                          => 'nein',
   'no article assigned yet'     => 'noch kein Artikel zugewiesen',
   'next'                        => 'vor',
   'no'                          => 'nein',
   'no article assigned yet'     => 'noch kein Artikel zugewiesen',

diff --git a/locale/en/all b/locale/en/all
index bbd38272c4f0c538e5132605b2c039977c47056d..32da270f6bc3157e704f20558f1bce41d8e9bd24 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -3745,6 +3745,7 @@ $self->{texts} = {
   'monthly'                     => '',
   'more'                        => '',
   'never'                       => '',
   'monthly'                     => '',
   'more'                        => '',
   'never'                       => '',

+  'new order controller'        => '',

   'next'                        => '',
   'no'                          => '',
   'no article assigned yet'     => '',
   'next'                        => '',
   'no'                          => '',
   'no article assigned yet'     => '',

diff --git a/menus/user/10-order-controller.yaml b/menus/user/10-order-controller.yaml
index 24473bae0bb20bb0b576ea15c5078b359f68a2c3..b26b75b5b4bc5d78460a383fae88f48caf4ff604 100644 (file)
--- a/menus/user/10-order-controller.yaml
+++ b/menus/user/10-order-controller.yaml
@@ -3,7 +3,7 @@
   name: Add Sales Order (experimental)
   icon: sales_order_add
   order: 350
   name: Add Sales Order (experimental)
   icon: sales_order_add
   order: 350

-  access: sales_order_edit
+  access: sales_order_edit & client/feature_experimental

   params:
     action: Order/add
     type: sales_order
   params:
     action: Order/add
     type: sales_order


@@ -13,7 +13,7 @@
   name: Add Purchase Order (experimental)
   icon: purchase_order_add
   order: 250
   name: Add Purchase Order (experimental)
   icon: purchase_order_add
   order: 250

-  access: purchase_order_edit
+  access: purchase_order_edit & client/feature_experimental

   params:
     action: Order/add
     type: purchase_order
   params:
     action: Order/add
     type: purchase_order