Auftrags-Controller: Link zum neuen Controller aus Auftragsliste (zum Testen).

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 91c5a983804954d0d18e926df6d102d0c807d33a..4c29292aacad229d1966e9ccaf04d197d4de57d7 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -839,7 +839,7 @@ sub orders {
 
   my @columns = (
     "transdate",               "reqdate",
 
   my @columns = (
     "transdate",               "reqdate",

-    "id",                      $ordnumber,
+    "id",                      $ordnumber,             "edit_exp",

     "cusordnumber",            "customernumber",
     "name",                    "netamount",
     "tax",                     "amount",
     "cusordnumber",            "customernumber",
     "name",                    "netamount",
     "tax",                     "amount",


@@ -866,7 +866,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));

   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;


@@ -947,6 +947,7 @@ sub orders {
     'expected_billing_date'   => { 'text' => $locale->text('Exp. bill. date'), },
     'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'expected_billing_date'   => { 'text' => $locale->text('Exp. bill. date'), },
     'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },

+    'edit_exp'                => { 'text' => $locale->text('Edit (experimental)'), },

     %column_defs_cvars,
   );
 
     %column_defs_cvars,
   );
 


@@ -1072,6 +1073,7 @@ sub orders {
 
     foreach my $column (@columns) {
       next if ($column eq 'ids');
 
     foreach my $column (@columns) {
       next if ($column eq 'ids');

+      next if ($column eq 'edit_exp');

       $row->{$column} = {
         'data'  => $oe->{$column},
         'align' => $column_alignment{$column},
       $row->{$column} = {
         'data'  => $oe->{$column},
         'align' => $column_alignment{$column},


@@ -1087,6 +1089,9 @@ sub orders {
 
     $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
 
 
     $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
 

+    $row->{edit_exp}->{data}   = $oe->{ordnumber};
+    $row->{edit_exp}->{link}   = build_std_url('script=controller.pl', 'action=Order/edit', "type=$form->{type}", 'id=' . E($oe->{id}));
+

     my $row_set = [ $row ];
 
     if (($form->{l_subtotal} eq 'Y')
     my $row_set = [ $row ];
 
     if (($form->{l_subtotal} eq 'Y')

diff --git a/locale/de/all b/locale/de/all
index 6a2d6f911c8c39e6a6a8fccb95322b638d076d67..60cb78ff4878aa5f46fec23c6388aa0972a96f28 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1011,6 +1011,7 @@ $self->{texts} = {
   'EUER'                        => 'Einnahmen-/Überschussrechnung',
   'Earlier versions of kivitendo contained bugs which might have led to wrong entries in the general ledger.' => 'Frühere Versionen von kivitendo enthielten Bugs, die zu falschen Einträgen im Hauptbuch geführt haben können.',
   'Edit'                        => 'Bearbeiten',
   'EUER'                        => 'Einnahmen-/Überschussrechnung',
   'Earlier versions of kivitendo contained bugs which might have led to wrong entries in the general ledger.' => 'Frühere Versionen von kivitendo enthielten Bugs, die zu falschen Einträgen im Hauptbuch geführt haben können.',
   'Edit'                        => 'Bearbeiten',

+  'Edit (experimental)'         => 'Bearbeiten (experimentell)',

   'Edit Access Rights'          => 'Zugriffsrechte bearbeiten',
   'Edit Access Rights for Follow-Ups' => 'Zugriff auf meine Wiedervorlagen regeln',
   'Edit Account'                => 'Kontodaten bearbeiten',
   'Edit Access Rights'          => 'Zugriffsrechte bearbeiten',
   'Edit Access Rights for Follow-Ups' => 'Zugriff auf meine Wiedervorlagen regeln',
   'Edit Account'                => 'Kontodaten bearbeiten',