X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=a0e7856aeef90d13836f55d812f56c92e2cbf369;hb=6092ef39d7da3d61b6df25c9dc3ff23b1a7b8acb;hp=d6be257517375fcdd5d02fdac34f6a8784895ec2;hpb=475b7a3ff7259102d938b91bfeac8012dbe69d45;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index d6be25751..a0e7856ae 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -436,6 +436,8 @@ sub header { common part_selection ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}"); + $layout->use_javascript("$_.js") for @{ $params{use_javascripts} // [] }; + $self->{favicon} ||= "favicon.ico"; $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->read_version if $self->{title} || !$self->{titlebar}; @@ -1085,29 +1087,31 @@ sub get_formname_translation { local $::locale = Locale->new($self->{recipient_locale}); my %formname_translations = ( - bin_list => $main::locale->text('Bin List'), - credit_note => $main::locale->text('Credit Note'), - invoice => $main::locale->text('Invoice'), - invoice_copy => $main::locale->text('Invoice Copy'), + bin_list => $main::locale->text('Bin List'), + credit_note => $main::locale->text('Credit Note'), + invoice => $main::locale->text('Invoice'), + invoice_copy => $main::locale->text('Invoice Copy'), invoice_for_advance_payment => $main::locale->text('Invoice for Advance Payment'), - final_invoice => $main::locale->text('Final Invoice'), - pick_list => $main::locale->text('Pick List'), - proforma => $main::locale->text('Proforma Invoice'), - purchase_order => $main::locale->text('Purchase Order'), - request_quotation => $main::locale->text('RFQ'), - sales_order => $main::locale->text('Confirmation'), - sales_quotation => $main::locale->text('Quotation'), - storno_invoice => $main::locale->text('Storno Invoice'), - sales_delivery_order => $main::locale->text('Delivery Order'), - purchase_delivery_order => $main::locale->text('Delivery Order'), - dunning => $main::locale->text('Dunning'), - dunning1 => $main::locale->text('Payment Reminder'), - dunning2 => $main::locale->text('Dunning'), - dunning3 => $main::locale->text('Last Dunning'), - dunning_invoice => $main::locale->text('Dunning Invoice'), - letter => $main::locale->text('Letter'), - ic_supply => $main::locale->text('Intra-Community supply'), - statement => $main::locale->text('Statement'), + final_invoice => $main::locale->text('Final Invoice'), + pick_list => $main::locale->text('Pick List'), + proforma => $main::locale->text('Proforma Invoice'), + purchase_order => $main::locale->text('Purchase Order'), + request_quotation => $main::locale->text('RFQ'), + sales_order => $main::locale->text('Confirmation'), + sales_quotation => $main::locale->text('Quotation'), + storno_invoice => $main::locale->text('Storno Invoice'), + sales_delivery_order => $main::locale->text('Delivery Order'), + purchase_delivery_order => $main::locale->text('Delivery Order'), + supplier_delivery_order => $main::locale->text('Supplier Delivery Order'), + rma_delivery_order => $main::locale->text('RMA Delivery Order'), + dunning => $main::locale->text('Dunning'), + dunning1 => $main::locale->text('Payment Reminder'), + dunning2 => $main::locale->text('Dunning'), + dunning3 => $main::locale->text('Last Dunning'), + dunning_invoice => $main::locale->text('Dunning Invoice'), + letter => $main::locale->text('Letter'), + ic_supply => $main::locale->text('Intra-Community supply'), + statement => $main::locale->text('Statement'), ); $main::lxdebug->leave_sub(); @@ -1134,10 +1138,10 @@ sub get_number_prefix_for_type { my $prefix = (first { $self->{type} eq $_ } qw(invoice invoice_for_advance_payment final_invoice credit_note)) ? 'inv' - : ($self->{type} =~ /_quotation$/) ? 'quo' - : ($self->{type} =~ /_delivery_order$/) ? 'do' - : ($self->{type} =~ /letter/) ? 'letter' - : 'ord'; + : ($self->{type} =~ /_quotation$/) ? 'quo' + : ($self->{type} =~ /_delivery_order$/) ? 'do' + : ($self->{type} =~ /letter/) ? 'letter' + : 'ord'; # better default like this? # : ($self->{type} =~ /(sales|purcharse)_order/ : 'ord';