projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Speichern von Verkäufern bei Kundenstammdaten.
[kivitendo-erp.git]
/
bin
/
mozilla
/
cp.pl
diff --git
a/bin/mozilla/cp.pl
b/bin/mozilla/cp.pl
index
6cde7f8
..
8e31a8f
100644
(file)
--- a/
bin/mozilla/cp.pl
+++ b/
bin/mozilla/cp.pl
@@
-185,8
+185,7
@@
sub form_header {
$button1 = qq|
<td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
<input type=button name=datepaid id="trigger1" value=|
$button1 = qq|
<td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
<input type=button name=datepaid id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
|;
#write Trigger
@@
-306,8
+305,7
@@
sub form_header {
<tr>
<th align=right nowrap>| . $locale->text('Amount') . qq|</th>
<td colspan=3><input name=amount size=10 value=|
<tr>
<th align=right nowrap>| . $locale->text('Amount') . qq|</th>
<td colspan=3><input name=amount size=10 value=|
- . $form->format_amount(\%myconfig, $form->{amount}, 2)
- . qq|></td>
+ . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-365,7
+363,8
@@
sub list_invoices {
for $i (1 .. $form->{rowcount}) {
map {
for $i (1 .. $form->{rowcount}) {
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(amount due paid);
$totalamount += $form->{"amount_$i"};
} qw(amount due paid);
$totalamount += $form->{"amount_$i"};
@@
-444,12
+443,12
@@
sub form_footer {
$media = qq|
<option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
$media = qq|
<option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
+ if ($myconfig{printer} && $latex
_templates
) {
$media .= qq|
<option value=printer $form->{OP}{printer}>|
. $locale->text('Printer');
}
$media .= qq|
<option value=printer $form->{OP}{printer}>|
. $locale->text('Printer');
}
- if ($latex) {
+ if ($latex
_templates
) {
$media .= qq|
<option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
$format .= qq|
$media .= qq|
<option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
$format .= qq|
@@
-475,7
+474,7
@@
sub form_footer {
<input class=submit type=submit name=action value="|
. $locale->text('Post') . qq|">|;
<input class=submit type=submit name=action value="|
. $locale->text('Post') . qq|">|;
- if ($latex) {
+ if ($latex
_templates
) {
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Print') . qq|">|;
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Print') . qq|">|;
@@
-484,14
+483,7
@@
sub form_footer {
print qq|
<select name=format>$format</select>
<select name=media>$media</select>
print qq|
<select name=format>$format</select>
<select name=media>$media</select>
-|;
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
</form>
</body>
</form>
</body>
@@
-604,11
+596,15
@@
sub update {
}
# recalculate
}
# recalculate
- $amount = $form->{amount};
+
+ # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+ # payment amount in Zahlungsausgang
+ $amount = 0;
for $i (1 .. $form->{rowcount}) {
map {
for $i (1 .. $form->{rowcount}) {
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(amount due paid);
if ($form->{"checked_$i"}) {
} qw(amount due paid);
if ($form->{"checked_$i"}) {
@@
-618,7
+614,9
@@
sub update {
$form->{"paid_$i"} = $form->{"due_$i"};
}
$form->{"paid_$i"} = $form->{"due_$i"};
}
- $amount -= $form->{"paid_$i"};
+ # Modified by J.Zach, see abovev
+ $amount += $form->{"paid_$i"};
+
} else {
$form->{"paid_$i"} = "";
}
} else {
$form->{"paid_$i"} = "";
}
@@
-630,6
+628,9
@@
sub update {
}
}
+ # Line added by J.Zach, see above
+ $form->{amount}=$amount;
+
&form_header;
&list_invoices;
&form_footer;
&form_header;
&list_invoices;
&form_footer;
@@
-716,10
+717,6
@@
sub print {
$form->{company} = $myconfig{company};
$form->{address} = $myconfig{address};
$form->{company} = $myconfig{company};
$form->{address} = $myconfig{address};
- @a =
- qw(name invnumber company address text_amount street zipcode city country memo);
- $form->format_string(@a);
-
$form->parse_template(\%myconfig, $userspath);
if ($form->{media} ne 'screen') {
$form->parse_template(\%myconfig, $userspath);
if ($form->{media} ne 'screen') {
@@
-758,7
+755,7
@@
sub check_form {
$form->{amount} = $amount;
for $i (1 .. $form->{rowcount}) {
$form->{amount} = $amount;
for $i (1 .. $form->{rowcount}) {
- if ($form->
{"paid_$i"}
) {
+ if ($form->
parse_amount(\%myconfig, $form->{"paid_$i"})
) {
$amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
push(@{ $form->{paid} }, $form->{"paid_$i"});
$amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
push(@{ $form->{paid} }, $form->{"paid_$i"});