From: Bernd Bleßmann Date: Wed, 19 Apr 2017 12:29:40 +0000 (+0200) Subject: Auftrags-Controller: als experimentelles Feature abschaltbar. X-Git-Tag: release-3.5.4~1121 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9fb7773a7849d2862e19d0b2a63414c49df0c37a;p=kivitendo-erp.git Auftrags-Controller: als experimentelles Feature abschaltbar. --- diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index f11970d0d..e49e462f3 100644 --- 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_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; diff --git a/locale/de/all b/locale/de/all index 563e5eb6a..f7b950ca2 100755 --- a/locale/de/all +++ b/locale/de/all @@ -3746,6 +3746,7 @@ $self->{texts} = { 'monthly' => 'monatlich', 'more' => 'mehr', 'never' => 'niemals', + 'new order controller' => 'Neuer Auftrags-Controller', 'next' => 'vor', 'no' => 'nein', 'no article assigned yet' => 'noch kein Artikel zugewiesen', diff --git a/locale/en/all b/locale/en/all index bbd38272c..32da270f6 100644 --- a/locale/en/all +++ b/locale/en/all @@ -3745,6 +3745,7 @@ $self->{texts} = { 'monthly' => '', 'more' => '', 'never' => '', + 'new order controller' => '', 'next' => '', 'no' => '', 'no article assigned yet' => '', diff --git a/menus/user/10-order-controller.yaml b/menus/user/10-order-controller.yaml index 24473bae0..b26b75b5b 100644 --- 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 - access: sales_order_edit + access: sales_order_edit & client/feature_experimental params: action: Order/add type: sales_order @@ -13,7 +13,7 @@ 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