X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9af6b210fad49e178c87d1d1f44112a149ed202f;hb=f869a45a1b3ff7c92a4b54f387ab12436e18e4b0;hp=d3e8044e732f1bdf4e2f9e931aa050c31cb4e295;hpb=79e8732a5e328517bf1839d14095bddc8d7cf894;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index d3e8044e7..9af6b210f 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -66,6 +66,8 @@ sub add { return $main::lxdebug->leave_sub() if (load_draft_maybe()); + $form->{show_details} = $::myconfig{show_form_details}; + if ($form->{type} eq "credit_note") { $form->{title} = $locale->text('Add Credit Note'); @@ -95,8 +97,7 @@ sub edit { $main::auth->assert('invoice_edit'); - $form->{AUTH} = $::auth; - + $form->{show_details} = $::myconfig{show_form_details}; $form->{taxincluded_changed_by_user} = 1; # show history button @@ -384,7 +385,7 @@ sub form_header { id action type media format queued printed emailed title vc discount title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id max_dunning_level dunning_amount dunning_description - shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax + shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew invoice_id @@ -395,7 +396,7 @@ sub form_header { $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part client_js)); $TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice(); - $form->{duedate} = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{due_due})->to_kivitendo if $TMPL_VAR{payment_terms_obj}; + $form->{duedate} = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj}; $form->header(); @@ -462,6 +463,11 @@ sub form_footer { } } + $form->{rounding} = $form->round_amount( + $form->round_amount($form->{invtotal}, 2, 1) - $form->round_amount($form->{invtotal}, 2), 2 + ); + $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1 ); + # follow ups if ($form->{id}) { $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || [];