projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Liste der Zahlungsein- und -ausgänge: Spalte "Referenz" mit Link zum Bearbeiten verse...
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
943dede
..
0b7e000
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-279,6
+279,13
@@
sub prepare_invoice {
sub form_header {
$lxdebug->enter_sub();
sub form_header {
$lxdebug->enter_sub();
+ if ($form->{old_employee_id}) {
+ $form->{employee_id} = $form->{old_employee_id};
+ }
+ if ($form->{old_salesman_id}) {
+ $form->{salesman_id} = $form->{old_salesman_id};
+ }
+
if ($edit) {
if ($form->{type} eq "credit_note") {
if ($edit) {
if ($form->{type} eq "credit_note") {
@@
-295,7
+302,7
@@
sub form_header {
}
}
}
}
}
}
-
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->{radier} =
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$form->{radier} =
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
@@
-1024,6
+1031,9
@@
if ($form->{type} eq "credit_note") {
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+ if ($form->{"exchangerate_$i"} == 0) {
+ $form->{"exchangerate_$i"} = "";
+ }
$exchangerate = qq| |;
if ($form->{currency} ne $form->{defaultcurrency}) {
if ($form->{"forex_$i"}) {
$exchangerate = qq| |;
if ($form->{currency} ne $form->{defaultcurrency}) {
if ($form->{"forex_$i"}) {
@@
-1161,11
+1171,16
@@
if ($form->{type} eq "credit_note") {
. Q($form->{id})
. qq|);" name="history" id="history" value="|
. $locale->text('history')
. Q($form->{id})
. qq|);" name="history" id="history" value="|
. $locale->text('history')
- . qq|">|;
+ . qq|">
|;
}
# /button for saving history
}
# /button for saving history
-
-
+
+ # mark_as_paid button
+ if($form->{id} ne "") {
+ print qq|<input type="submit" class="submit" name="action" value="|
+ . $locale->text('mark as paid') . qq|">|;
+ }
+ # /mark_as_paid button
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
qq|
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
qq|
@@
-1186,6
+1201,12
@@
print qq|
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
+sub mark_as_paid {
+ $lxdebug->enter_sub();
+ &mark_as_paid_common(\%myconfig,"ar");
+ $lxdebug->leave_sub();
+}
+
sub update {
$lxdebug->enter_sub();
sub update {
$lxdebug->enter_sub();
@@
-1361,6
+1382,8
@@
sub update {
sub post_payment {
$lxdebug->enter_sub();
sub post_payment {
$lxdebug->enter_sub();
+
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
@@
-1392,6
+1415,8
@@
sub post_payment {
sub post {
$lxdebug->enter_sub();
sub post {
$lxdebug->enter_sub();
+
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("customer", $locale->text('Customer missing!'));
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("customer", $locale->text('Customer missing!'));
@@
-1438,6
+1463,7
@@
sub post {
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
+ $form->{storno} = 0;
$form->{label} = $locale->text('Invoice');
$form->{label} = $locale->text('Invoice');
@@
-1535,7
+1561,6
@@
sub preview {
$form->{preview} = 1;
$old_form = new Form;
for (keys %$form) { $old_form->{$_} = $form->{$_} }
$form->{preview} = 1;
$old_form = new Form;
for (keys %$form) { $old_form->{$_} = $form->{$_} }
- $old_form->{rowcount}++;
&print_form($old_form);
$lxdebug->leave_sub();
&print_form($old_form);
$lxdebug->leave_sub();