projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doppelten Eintrag von credit_note bei Druckvorlagen entfernt
[kivitendo-erp.git]
/
bin
/
mozilla
/
ir.pl
diff --git
a/bin/mozilla/ir.pl
b/bin/mozilla/ir.pl
index
6c9c8a8
..
440ee6e
100644
(file)
--- a/
bin/mozilla/ir.pl
+++ b/
bin/mozilla/ir.pl
@@
-411,7
+411,7
@@
sub form_header {
"duedate", "BL", "trigger2");
my $follow_up_vc = $form->{vendor};
"duedate", "BL", "trigger2");
my $follow_up_vc = $form->{vendor};
- $follow_up_vc =~ s/--
.*?
//;
+ $follow_up_vc =~ s/--
\d*\s*$
//;
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
@@
-826,7
+826,7
@@
sub form_footer {
|;
if ($form->{id}) {
|;
if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap");
+ my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap")
&& (($totalpaid == 0) || ($totalpaid eq ""))
;
print qq|<input class=submit type=submit name=action value="|
. $locale->text('Post Payment') . qq|">
print qq|<input class=submit type=submit name=action value="|
. $locale->text('Post Payment') . qq|">
@@
-857,7
+857,7
@@
sub form_footer {
}
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers);
}
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers);
- $form->hide_form(qw(rowcount callback draft_id draft_description));
+ $form->hide_form(qw(rowcount callback draft_id draft_description
vendor_discount
));
# button for saving history
if($form->{id} ne "") {
# button for saving history
if($form->{id} ne "") {
@@
-876,7
+876,6
@@
sub form_footer {
}
# /mark_as_paid button
print qq|</form>
}
# /mark_as_paid button
print qq|</form>
-
</body>
</html>
|;
</body>
</html>
|;
@@
-941,6
+940,9
@@
sub update {
# override sellprice if there is one entered
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
# override sellprice if there is one entered
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
+ # ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig,
+ $form->{vendor_discount} * 100 );
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };