From 87599e477cc6e1df8dded5fda69f21d01278e71e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 13 Oct 2016 14:08:12 +0200 Subject: [PATCH] oe: auf prototyp auf einzelnes add umgeschrieben --- bin/mozilla/oe.pl | 87 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 843c760f2..560ffcd07 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -452,24 +452,75 @@ sub form_header { my $tpca_remainder = 0; - $::request->layout->get('actionbar')->add_actions( - [ t8('Update'), submit => [ '#form', { action_update => 1 } ] ], - [ t8('Ship to'), submit => [ '#form', { action_ship_to => 1 } ] ], - [ t8('Print'), submit => [ '#form', { action_print => 1 } ], checks => [ qw(kivi.SalesPurchase.check_transaction_description) ] ], - [ t8('E Mail'), submit => [ '#form', { action_print => 1 } ], checks => [ qw(kivi.SalesPurchase.check_transaction_description) ] ], - [ t8('Save'), submit => [ '#form', { action_save => 1 } ], checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], confirm => t8('Missing transport cost: #1 Are you sure?', $tpca_remainder) ], # always, optional warn_save_active_periodic_invoice, - [ t8('Save and Close'), submit => [ '#form', { action_save_and_close => 1 } ], checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], confirm => t8('Missing transport cost: #1 Are you sure?', $tpca_remainder) ], # always, optional warn_save_active_periodic_invoice, - [ t8('Follow-Up'), function => [ 'follow_up_window' ], disabled => !$::form->{id} ], - [ t8('History'), function => [ 'set_history_window', $::form->{id} * 1, 'id' ], disabled => !$::form->{id} ], - [ t8('Save as new'), submit => [ '#form', { action_save_as_new => 1 } ], checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], disabled => !$::form->{id} ], - ([ t8('Delete'), submit => [ '#form', { action_delete => 1 } ], disabled => !$::form->{id} ]) x!!( $::form->{id} && (!$is_sales_ord || $::instance_conf->get_sales_order_show_delete) && (!$is_pur_ord || $::instance_conf->get_purchase_order_show_delete ) ), - ([ t8('Sales Order'), submit => [ '#form', { action_sales_order => 1 } ], disabled => !$::form->{id} ]) x!!($is_sales_quo ), - ([ t8('Purchase Order'), submit => [ '#form', { action_sales_order => 1 } ], disabled => !$::form->{id} ]) x!!($is_req_quo ), - ([ t8('Delivery Order'), submit => [ '#form', { action_delivery_order => 1 } ], disabled => !$::form->{id} ]) x!!(($is_sales_ord || $is_pur_ord ) ), - ([ t8('Invoice'), submit => [ '#form', { action_invoice => 1 } ], disabled => !$::form->{id} ]) x!!($allow_invoice ), - [ t8('Quotation'), submit => [ '#form', { action_quotation => 1 } ], disabled => !$::form->{id} ], - [ t8('Request for Quotation'), submit => [ '#form', { action_reqest_for_quotation => 1 } ], disabled => !$::form->{id} ], - ); + for my $bar ($::request->layout->get('actionbar')) { + $bar->add_actions([ t8('Update'), + submit => [ '#form', { action_update => 1 } ], + ]); + $bar->add_actions([ t8('Ship to'), + submit => [ '#form', { action_ship_to => 1 } ], + ]); + $bar->add_actions([ t8('Print'), + submit => [ '#form', { action_print => 1 } ], + checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], + ]); + $bar->add_actions([ t8('E Mail'), + submit => [ '#form', { action_print => 1 } ], + checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], + ]); + $bar->add_actions([ t8('Save'), + submit => [ '#form', { action_save => 1 } ], + checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], + confirm => t8('Missing transport cost: #1 Are you sure?', $tpca_remainder), + # optional warn_save_active_periodic_invoice, + ]); + $bar->add_actions([ t8('Save and Close'), + submit => [ '#form', { action_save_and_close => 1 } ], + checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], + confirm => t8('Missing transport cost: #1 Are you sure?', $tpca_remainder), + # always, optional warn_save_active_periodic_invoice, + ]); + $bar->add_actions([ t8('Follow-Up'), + function => [ 'follow_up_window' ], + disabled => !$::form->{id}, + ]); + $bar->add_actions([ t8('History'), + function => [ 'set_history_window', $::form->{id} * 1, 'id' ], + disabled => !$::form->{id}, + ]); + $bar->add_actions([ t8('Save as new'), + submit => [ '#form', { action_save_as_new => 1 } ], + checks => [ qw(kivi.SalesPurchase.check_transaction_description) ], + disabled => !$::form->{id}, + ]); + $bar->add_actions([ t8('Delete'), + submit => [ '#form', { action_delete => 1 } ], + disabled => !$::form->{id}, + ]) if $::form->{id} && (!$is_sales_ord || $::instance_conf->get_sales_order_show_delete) && (!$is_pur_ord || $::instance_conf->get_purchase_order_show_delete); + $bar->add_actions([ t8('Sales Order'), + submit => [ '#form', { action_sales_order => 1 } ], + disabled => !$::form->{id}, + ]) if $is_sales_quo; + $bar->add_actions([ t8('Purchase Order'), + submit => [ '#form', { action_sales_order => 1 } ], + disabled => !$::form->{id}, + ]) if $is_req_quo; + $bar->add_actions([ t8('Delivery Order'), + submit => [ '#form', { action_delivery_order => 1 } ], + disabled => !$::form->{id}, + ]) if $is_sales_ord || $is_pur_ord; + $bar->add_actions([ t8('Invoice'), + submit => [ '#form', { action_invoice => 1 } ], + disabled => !$::form->{id}, + ]) if $allow_invoice; + $bar->add_actions([ t8('Quotation'), + submit => [ '#form', { action_quotation => 1 } ], + disabled => !$::form->{id}, + ]); + $bar->add_actions([ t8('Request for Quotation'), + submit => [ '#form', { action_reqest_for_quotation => 1 } ], + disabled => !$::form->{id} + ]); + } $form->header; if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) { -- 2.20.1