projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Order-Controller: Artikelklassifizierung berücksichtigen
[kivitendo-erp.git]
/
bin
/
mozilla
/
ir.pl
diff --git
a/bin/mozilla/ir.pl
b/bin/mozilla/ir.pl
index
234bbc5
..
48ff6c3
100644
(file)
--- a/
bin/mozilla/ir.pl
+++ b/
bin/mozilla/ir.pl
@@
-451,7
+451,7
@@
sub form_header {
shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
convert_from_do_ids convert_from_oe_ids convert_from_ap_ids show_details gldate useasnew
), @custom_hiddens,
shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
convert_from_do_ids convert_from_oe_ids convert_from_ap_ids show_details gldate useasnew
), @custom_hiddens,
- map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
+ map { $_.'_rate', $_.'_description', $_.'_taxnumber'
, $_.'_tax_id'
} split / /, $form->{taxaccounts}];
$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->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
$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->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
@@
-498,12
+498,6
@@
sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
$form->{oldinvtotal} = $form->{invtotal};
$form->{invtotal} = $form->{invsubtotal};
$form->{oldinvtotal} = $form->{invtotal};
- # note rows
- $form->{rows} = max 2,
- $form->numtextrows($form->{notes}, 26, 8),
- $form->numtextrows($form->{intnotes}, 35, 8);
-
-
# tax, total and subtotal calculations
my ($tax, $subtotal);
$form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
# tax, total and subtotal calculations
my ($tax, $subtotal);
$form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
@@
-941,7
+935,7
@@
sub post {
$form->save_history;
}
# /saving the history
$form->save_history;
}
# /saving the history
- $form->{callback} = 'ir.pl?action=
add'
;
+ $form->{callback} = 'ir.pl?action=
edit&id=' . $form->{id}
;
$form->redirect( $locale->text('Invoice')
. " $form->{invnumber} "
. ", " . $locale->text('ID')
$form->redirect( $locale->text('Invoice')
. " $form->{invnumber} "
. ", " . $locale->text('ID')