X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=e13e31e3327fcefe1c8a25fe556be45b300b2895;hb=9c76bacaa1bfbefc80f7d595ca47ec882266dc70;hp=69dd201d94592247ab19fbe1036ce871aad11c38;hpb=a3a6d136cbd97bd18b5943937b80b1b1b504ef3b;p=kivitendo-erp.git

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 69dd201d9..e13e31e33 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -222,68 +222,87 @@ sub setup_ir_action_bar {
   my $change_on_same_day_only = $::instance_conf->get_ir_changeable == 2 && ($form->current_date(\%::myconfig) ne $form->{gldate});
 
   for my $bar ($::request->layout->get('actionbar')) {
-    $bar->add_actions([ t8('Update'),
-      submit    => [ '#form', { action_update => 1 } ],
-      id        => 'update_button',
-      accesskey => 'enter',
-    ]);
-
-    $bar->add_actions("combobox");
-    $bar->actions->[-1]->add_actions([ t8('Post'),
-      submit   => [ '#form', { action_post => 1 } ],
-      disabled => $form->{locked}                           ? t8('The billing period has already been locked.')
-                : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
-                : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
-                : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
-                :                                             undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Post Payment'),
-      submit   => [ '#form', { action_post_payment => 1 } ],
-      disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('mark as paid'),
-      submit   => [ '#form', { action_mark_as_paid => 1 } ],
-      confirm  => t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?'),
-      disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
-    ]) if $::instance_conf->get_ir_show_mark_as_paid;
-
-
-    $bar->add_actions("combobox");
-    $bar->actions->[-1]->add_actions([ t8('Storno'),
-      submit   => [ '#form', { action_storno => 1 } ],
-      confirm  => t8('Do you really want to cancel this invoice?'),
-      disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Delete'),
-      submit   => [ '#form', { action_delete => 1 } ],
-      confirm  => t8('Do you really want to delete this object?'),
-      disabled => !$form->{id}             ? t8('This invoice has not been posted yet.')
-                : $form->{locked}          ? t8('The billing period has already been locked.')
-                : $change_never            ? t8('Changing invoices has been disabled in the configuration.')
-                : $change_on_same_day_only ? t8('Invoices can only be changed on the day they are posted.')
-                :                            undef,
-    ]);
-
-    $bar->add_actions('separator');
-
-    $bar->add_actions('combobox');
-    $bar->actions->[-1]->add_actions([ t8('more'),
-      disabled => 1,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('History'),
-      call     => [ 'set_history_window', $::form->{id} * 1, 'id', 'glid' ],
-      disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Follow-Up'),
-      call     => [ 'follow_up_window' ],
-      disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
-    ]);
-    $bar->actions->[-1]->add_actions([ t8('Drafts'),
-      call     => [ 'kivi.Draft.popup', 'ir', 'invoice', $::form->{draft_id}, $::form->{draft_description} ],
-      disabled => $form->{id}     ? t8('This invoice has already been posted.')
-                : $form->{locked} ? t8('The billing period has already been locked.')
-                :                   undef,
-    ]);
+    $bar->add(
+      action => [
+        t8('Update'),
+        submit    => [ '#form', { action => "update" } ],
+        id        => 'update_button',
+        accesskey => 'enter',
+      ],
+
+      combobox => [
+        action => [
+          t8('Post'),
+          submit   => [ '#form', { action => "post" } ],
+          disabled => $form->{locked}                           ? t8('The billing period has already been locked.')
+                    : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
+                    : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
+                    : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+                    :                                             undef,
+        ],
+        action => [
+          t8('Post Payment'),
+          submit   => [ '#form', { action => "post_payment" } ],
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+        ],
+        action => [
+          t8('Mark as paid'),
+          submit   => [ '#form', { action => "mark_as_paid" } ],
+          confirm  => t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?'),
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+          only_if  => $::instance_conf->get_ir_show_mark_as_paid,
+        ],
+      ], # end of combobox "Post"
+
+      combobox => [
+        action => [ t8('Storno'),
+          submit   => [ '#form', { action => "storno" } ],
+          confirm  => t8('Do you really want to cancel this invoice?'),
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+        ],
+        action => [ t8('Delete'),
+          submit   => [ '#form', { action => "delete" } ],
+          confirm  => t8('Do you really want to delete this object?'),
+          disabled => !$form->{id}             ? t8('This invoice has not been posted yet.')
+                    : $form->{locked}          ? t8('The billing period has already been locked.')
+                    : $change_never            ? t8('Changing invoices has been disabled in the configuration.')
+                    : $change_on_same_day_only ? t8('Invoices can only be changed on the day they are posted.')
+                    :                            undef,
+        ],
+      ], # end of combobox "Storno"
+
+      'separator',
+
+      combobox => [
+        action => [ t8('Workflow') ],
+        action => [
+          t8('Use As New'),
+          submit   => [ '#form', { action => "use_as_new" } ],
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+        ],
+       ], # end of combobox "Workflow"
+
+      combobox => [
+        action => [ t8('more') ],
+        action => [
+          t8('History'),
+          call     => [ 'set_history_window', $::form->{id} * 1, 'id', 'glid' ],
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+        ],
+        action => [
+          t8('Follow-Up'),
+          call     => [ 'follow_up_window' ],
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+        ],
+        action => [
+          t8('Drafts'),
+          call     => [ 'kivi.Draft.popup', 'ir', 'invoice', $::form->{draft_id}, $::form->{draft_description} ],
+          disabled => $form->{id}     ? t8('This invoice has already been posted.')
+                    : $form->{locked} ? t8('The billing period has already been locked.')
+                    :                   undef,
+        ],
+      ], # end of combobox "more"
+    );
   }
 }
 
@@ -355,7 +374,7 @@ sub form_header {
 
   # hiddens
   $TMPL_VAR{HIDDENS} = [qw(
-    id action type media format queued printed emailed title vc discount
+    id type queued printed emailed title vc discount
     title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
     max_dunning_level dunning_amount
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax