projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fehler bei Lieferadressen die Anfuehrungszeichen im Namen enthalten
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
e281da7
..
6941424
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-432,11
+432,12
@@
sub form_header {
"<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
} else {
$form->{selectshipto} .=
"<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
} else {
$form->{selectshipto} .=
- "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment
_1
}</option>";
+ "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
}
}
} 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/;
@@
-445,9
+446,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
>$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}">|;
@@
-493,13
+494,8
@@
sub form_header {
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
- $terms = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Terms: Net') . qq|</th>
- <td nowrap><input name=terms size="3" maxlength="3" value=$form->{terms}> |
- . $locale->text('days') . qq|</td>
- </tr>
-|;
+ $terms = qq|<input name=terms size="3" maxlength="3" value="| .
+ $form->quote($form->{terms}) . qq|">|;
if ($form->{business}) {
$business = qq|
if ($form->{business}) {
$business = qq|
@@
-600,7
+596,7
@@
sub form_header {
<td>$form->{creditlimit}</td>
<td width=20%></td>
<th nowrap>| . $locale->text('Remaining') . qq|</th>
<td>$form->{creditlimit}</td>
<td width=20%></td>
<th nowrap>| . $locale->text('Remaining') . qq|</th>
- <td class="plus$n">$form->{creditremaining}</td>
+ <td class="plus$n"
nowrap
>$form->{creditremaining}</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-1618,7
+1614,9
@@
sub orders {
. qq|</a></th>|;
$column_header{quonumber} =
qq|<th><a class=listheading href=$href&sort=quonumber>|
. qq|</a></th>|;
$column_header{quonumber} =
qq|<th><a class=listheading href=$href&sort=quonumber>|
- . $locale->text('Quotation')
+ . ($form->{"type"} eq "request_quotation" ?
+ $locale->text('RFQ') :
+ $locale->text('Quotation'))
. qq|</a></th>|;
$column_header{name} =
qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
. qq|</a></th>|;
$column_header{name} =
qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
@@
-2141,6
+2139,13
@@
sub invoice {
$form->{cp_id} *= 1;
$form->{cp_id} *= 1;
+ for $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+ $form->{"${_}_${i}"})
+ if ($form->{"${_}_${i}"}) }
+ qw(ship qty sellprice listprice basefactor));
+ }
+
if ( $form->{type} =~ /_order/
&& $form->{currency} ne $form->{defaultcurrency}) {
if ( $form->{type} =~ /_order/
&& $form->{currency} ne $form->{defaultcurrency}) {
@@
-2165,8
+2170,7
@@
sub invoice {
# if not it's most likely a collective order, which can't be saved back
# so they just have to be closed
if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
# if not it's most likely a collective order, which can't be saved back
# so they just have to be closed
if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
- relink_accounts();
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, \%$form);
} else {
OE->close_orders(\%myconfig, \%$form);
}
} else {
OE->close_orders(\%myconfig, \%$form);
}
@@
-2432,9
+2436,7
@@
sub purchase_order {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
- $form->{closed} = 1;
- relink_accounts();
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, \%$form);
}
$form->{cp_id} *= 1;
}
$form->{cp_id} *= 1;