projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bei Einkaufs- und Verkaufsmasken Felder für Angebots- und Auftragsdatum hinzugefügt.
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
6b00418
..
4637f6b
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-69,8
+69,6
@@
sub add {
}
&invoice_links;
&prepare_invoice;
}
&invoice_links;
&prepare_invoice;
- $form->{format} = "pdf";
-
&display_form;
$lxdebug->leave_sub();
&display_form;
$lxdebug->leave_sub();
@@
-246,11
+244,9
@@
sub prepare_invoice {
if ($form->{type} eq "credit_note") {
$form->{type} = "credit_note";
$form->{formname} = "credit_note";
if ($form->{type} eq "credit_note") {
$form->{type} = "credit_note";
$form->{formname} = "credit_note";
- $form->{media} = "screen";
} else {
$form->{type} = "invoice";
$form->{formname} = "invoice";
} else {
$form->{type} = "invoice";
$form->{formname} = "invoice";
- $form->{media} = "screen";
}
if ($form->{id}) {
}
if ($form->{id}) {
@@
-324,16
+320,22
@@
sub form_header {
}
}
}
}
+ my $set_duedate_url =
+ "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate";
+
+ my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url );
+ push(@ { $form->{AJAX} }, $pjx);
if (@{ $form->{TAXZONE} }) {
$form->{selecttaxzone} = "";
foreach $item (@{ $form->{TAXZONE} }) {
if ($item->{id} == $form->{taxzone_id}) {
$form->{selecttaxzone} .=
if (@{ $form->{TAXZONE} }) {
$form->{selecttaxzone} = "";
foreach $item (@{ $form->{TAXZONE} }) {
if ($item->{id} == $form->{taxzone_id}) {
$form->{selecttaxzone} .=
- "<option value=$item->{id} selected>$item->{description}</option>";
+ "<option value=$item->{id} selected>" . H($item->{description}) .
+ "</option>";
} else {
$form->{selecttaxzone} .=
} else {
$form->{selecttaxzone} .=
- "<option value=$item->{id}>
$item->{description}
</option>";
+ "<option value=$item->{id}>
" . H($item->{description}) . "
</option>";
}
}
}
}
@@
-343,11
+345,6
@@
sub form_header {
$form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
}
}
$form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
}
}
- if ($form->{rowcount} >0) {
- $form->{selecttaxzone} =~ /<option value=\d+ selected>.*?<\/option>/;
- $form->{selecttaxzone} = $&;
- }
-
$taxzone = qq|
<tr>
$taxzone = qq|
<tr>
@@
-370,6
+367,7
@@
sub form_header {
}
} else {
}
} else {
+ $form->{selectshipto} = $form->unquote($form->{selectshipto});
$form->{selectshipto} =~ s/ selected//g;
if ($form->{shipto_id} ne "") {
$form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
$form->{selectshipto} =~ s/ selected//g;
if ($form->{shipto_id} ne "") {
$form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
@@
-378,8
+376,9
@@
sub form_header {
$shipto = qq|
<th align=right>| . $locale->text('Shipping Address') . qq|</th>
$shipto = qq|
<th align=right>| . $locale->text('Shipping Address') . qq|</th>
- <td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>
- <input type=hidden name=selectshipto value="$form->{selectshipto}">|;
+ <td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>|;
+ $form->{selectshipto} = $form->quote($form->{selectshipto});
+ $shipto .= qq| <input type=hidden name=selectshipto value="$form->{selectshipto}">|;
@@
-581,6
+580,13
@@
sub form_header {
$onload = qq|alert('$credittext')|;
}
$onload = qq|alert('$credittext')|;
}
+ $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
+
+ $jsscript .=
+ $form->write_trigger(\%myconfig, 2,
+ "orddate", "BL", "trigger_orddate",
+ "quodate", "BL", "trigger_quodate");
+
$form->header;
print qq|
$form->header;
print qq|
@@
-747,10
+753,20
@@
print qq| <tr>
<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
</tr>
<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
</tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
+ <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|"></td>
+ <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
</tr>
<tr>
<th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
</tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
+ <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
+ <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
<tr>
<th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
@@
-911,7
+927,7
@@
sub form_footer {
<tr valign=top>
<td>$notes</td>
<td>$intnotes</td>
<tr valign=top>
<td>$notes</td>
<td>$intnotes</td>
- <td><select name=payment_id
tabindex=24
>$payment
+ <td><select name=payment_id
onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])"
>$payment
</select></td>
</tr>
</table>
</select></td>
</tr>
</table>
@@
-1002,6
+1018,8
@@
if ($form->{type} eq "credit_note") {
</tr>
";
</tr>
";
+ my @triggers = ();
+
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
@@
-1014,8
+1032,10
@@
if ($form->{type} eq "credit_note") {
# format amounts
$totalpaid += $form->{"paid_$i"};
# format amounts
$totalpaid += $form->{"paid_$i"};
- $form->{"paid_$i"} =
- $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ if ($form->{"paid_$i"}) {
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ }
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
@@
-1040,7
+1060,8
@@
if ($form->{type} eq "credit_note") {
$column_data{"AR_paid_$i"} =
qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
$column_data{"datepaid_$i"} =
$column_data{"AR_paid_$i"} =
qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
$column_data{"datepaid_$i"} =
- qq|<td align=center><input name="datepaid_$i" size=11 title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}></td>|;
+ qq|<td align=center><input id="datepaid_$i" name="datepaid_$i" size=11 title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}>
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
$column_data{"source_$i"} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{"memo_$i"} =
$column_data{"source_$i"} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{"memo_$i"} =
@@
-1049,6
+1070,7
@@
if ($form->{type} eq "credit_note") {
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
</tr>\n";
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
</tr>\n";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
print qq|
}
print qq|
@@
-1079,7
+1101,7
@@
if ($form->{type} eq "credit_note") {
if ($form->{id}) {
print qq|
if ($form->{id}) {
print qq|
- <input class=submit type=submit
name=acti
on value="|
+ <input class=submit type=submit
accesskey="u" name=action id=update_butt
on value="|
. $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Ship to') . qq|">
. $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Ship to') . qq|">
@@
-1091,6
+1113,9
@@
if ($form->{type} eq "credit_note") {
. $locale->text('Storno') . qq|">| unless ($form->{storno});
print qq|<input class=submit type=submit name=action value="|
. $locale->text('Post Payment') . qq|">
. $locale->text('Storno') . qq|">| unless ($form->{storno});
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('Use As Template') . qq|">
|;
if ($form->{id} && !($form->{type} eq "credit_note")) {
print qq|
|;
if ($form->{id} && !($form->{type} eq "credit_note")) {
print qq|
@@
-1115,7
+1140,7
@@
if ($form->{type} eq "credit_note") {
} else {
if ($invdate > $closedto) {
} else {
if ($invdate > $closedto) {
- print qq|<input class=submit type=submit name=action value="|
+ print qq|<input class=submit type=submit name=action
id=update_button
value="|
. $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Ship to') . qq|">
. $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Ship to') . qq|">
@@
-1130,12
+1155,8
@@
if ($form->{type} eq "credit_note") {
}
}
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
<input type=hidden name=rowcount value=$form->{rowcount}>
<input type=hidden name=rowcount value=$form->{rowcount}>
@@
-1179,7
+1200,7
@@
sub update {
)));
for $i (1 .. $form->{paidaccounts}) {
)));
for $i (1 .. $form->{paidaccounts}) {
- if ($form->
parse_amount(\%myconfig, $form->{"paid_$i"})
) {
+ if ($form->
{"paid_$i"}
) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
@@
-1323,7
+1344,7
@@
sub update {
sub post_payment {
$lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
sub post_payment {
$lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
- if ($form->
parse_amount(\%myconfig, $form->{"paid_$i"})
) {
+ if ($form->
{"paid_$i"}
) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
@@
-1437,6
+1458,18
@@
sub print_and_post {
}
}
+sub use_as_template {
+ $lxdebug->enter_sub();
+
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ $form->{paidaccounts} = 1;
+ $form->{rowcount}--;
+ $form->{invdate} = $form->current_date(\%myconfig);
+ &display_form;
+
+ $lxdebug->leave_sub();
+}
+
sub storno {
$lxdebug->enter_sub();
sub storno {
$lxdebug->enter_sub();
@@
-1448,7
+1481,6
@@
sub storno {
$form->{storno} = 1;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
$form->{storno} = 1;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
- $form->{rowcount}--;
&post();
$lxdebug->leave_sub();
&post();
$lxdebug->leave_sub();