projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debugcode entfernt.
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
68bfb01
..
f39ff13
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-240,8
+240,6
@@
sub prepare_invoice {
if ($form->{id}) {
if ($form->{id}) {
- map { $form->{$_} =~ s/\"/"/g }
- qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
# # get pricegroups for parts
# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# # get pricegroups for parts
# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@
-268,8
+266,6
@@
sub prepare_invoice {
$form->{"qty_$i"} =
$form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
$form->{"qty_$i"} =
$form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit partnotes);
$form->{rowcount} = $i;
}
$form->{rowcount} = $i;
}
@@
-532,7
+528,7
@@
sub form_header {
$jsscript = "";
if ($form->{type} eq "credit_note") {
$button1 = qq|
$jsscript = "";
if ($form->{type} eq "credit_note") {
$button1 = qq|
- <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <td
nowrap
><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
<input type="button" name="invdate" id="trigger1" value="|
. $locale->text('button') . qq|"></td>|;
<input type="button" name="invdate" id="trigger1" value="|
. $locale->text('button') . qq|"></td>|;
@@
-543,7
+539,7
@@
sub form_header {
"trigger1");
} else {
$button1 = qq|
"trigger1");
} else {
$button1 = qq|
- <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <td
nowrap
><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
<input type="button" name="invdate" id="trigger1" value="|
. $locale->text('button') . qq|"></td>
|;
<input type="button" name="invdate" id="trigger1" value="|
. $locale->text('button') . qq|"></td>
|;
@@
-659,10
+655,13
@@
sub form_header {
<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
<td colspan="3"> | .
$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
<td colspan="3"> | .
$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
- qq|</tr>
+ qq| </td>
+ </tr>
<tr>
<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
<tr>
<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
- <td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
+ <td colspan="3"> | .
+ $cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Transaction description') . qq|</th>
</tr>
<tr>
<th align="right">| . $locale->text('Transaction description') . qq|</th>
@@
-695,10
+694,14
@@
print qq| </table>
$employees
$salesman
|;
$employees
$salesman
|;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
if ($form->{type} eq "credit_note") {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
if ($form->{type} eq "credit_note") {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
- <td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
</tr>
<tr>
<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
@@
-707,7
+710,9
@@
print qq| <tr>
} else {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
} else {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
- <td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Invoice Date') . qq|</th>
</tr>
<tr>
<th align="right">| . $locale->text('Invoice Date') . qq|</th>
@@
-717,6
+722,12
@@
print qq| <tr>
<th align="right">| . $locale->text('Due Date') . qq|</th>
$button2
</tr>
<th align="right">| . $locale->text('Due Date') . qq|</th>
$button2
</tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
+ <td> |.
+ $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
+ qq| </td>
+ </tr>
<tr>
<th align="right">| . $locale->text('Delivery Date') . qq|</th>
$button3
<tr>
<th align="right">| . $locale->text('Delivery Date') . qq|</th>
$button3
@@
-724,7
+735,9
@@
print qq| <tr>
}
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
}
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
- <td><input name="ordnumber" size="11" value="$form->{ordnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
@@
-733,7
+746,9
@@
print qq| <tr>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
- <td><input name="quonumber" size="11" value="$form->{quonumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
@@
-742,7
+757,9
@@
print qq| <tr>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
- <td><input name="cusordnumber" size="11" value="$form->{cusordnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>