projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed date problems between database and screen-output,
[kivitendo-erp.git]
/
bin
/
mozilla
/
ic.pl
diff --git
a/bin/mozilla/ic.pl
b/bin/mozilla/ic.pl
index
6d1f611
..
df6e2ca
100644
(file)
--- a/
bin/mozilla/ic.pl
+++ b/
bin/mozilla/ic.pl
@@
-30,6
+30,7
@@
# Inventory Control module
#
#======================================================================
# Inventory Control module
#
#======================================================================
+#$locale->text('ea');
use SL::IC;
#use SL::PE;
use SL::IC;
#use SL::PE;
@@
-51,7
+52,7
@@
sub add {
$form->{unit} =
($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea');
$form->{unit} =
($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea');
-
+ IC->get_pricegroups(\%myconfig, \%$form);
&link_part;
&display_form;
&link_part;
&display_form;
@@
-2718,6
+2719,7
@@
sub save {
# $locale->text('Assembly Number missing!')
# save part
# $locale->text('Assembly Number missing!')
# save part
+ $lxdebug->message(LXDebug::DEBUG1, "ic.pl: sellprice in save = $form->{sellprice}\n");
$rc = IC->save(\%myconfig, \%$form);
if ($rc == 3) {
$form->error($locale->text('Partnumber not unique!'));
$rc = IC->save(\%myconfig, \%$form);
if ($rc == 3) {
$form->error($locale->text('Partnumber not unique!'));
@@
-2772,11
+2774,10
@@
sub save {
map { $form->{"${_}_$i"} = $newform{$_} }
qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice);
$form->{"sellprice_$i"} = $newform{lastcost} if ($form->{vendor_id});
map { $form->{"${_}_$i"} = $newform{$_} }
qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice);
$form->{"sellprice_$i"} = $newform{lastcost} if ($form->{vendor_id});
-
if ($form->{exchangerate} != 0) {
$form->{"sellprice_$i"} /= $form->{exchangerate};
}
if ($form->{exchangerate} != 0) {
$form->{"sellprice_$i"} /= $form->{exchangerate};
}
-
+ $lxdebug->message(LXDebug::DEBUG1, qq|sellprice_$i in previousform 2 = |.$form->{"sellprice_$i"}.qq|\n|);
map { $form->{"taxaccounts_$i"} .= "$_ " } split / /,
$newform{taxaccount};
chop $form->{"taxaccounts_$i"};
map { $form->{"taxaccounts_$i"} .= "$_ " } split / /,
$newform{taxaccount};
chop $form->{"taxaccounts_$i"};
@@
-2797,6
+2798,10
@@
sub save {
$form->{creditremaining} -= $amount;
$form->{creditremaining} -= $amount;
+ # redo number formatting, because invoice parse them!
+ $i = $form->{rowcount};
+ map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) }
+ qw(weight listprice sellprice rop);
}
$form->{"id_$i"} = $parts_id;
}
$form->{"id_$i"} = $parts_id;
@@
-2818,7
+2823,7
@@
sub save {
}
$form->{callback} = $callback;
}
}
$form->{callback} = $callback;
}
-
+ $lxdebug->message(LXDebug::DEBUG1, qq|ic.pl: sellprice_$i nach sub save = |.$form->{"sellprice_$i"}.qq|\n|);
# redirect
$form->redirect;
# redirect
$form->redirect;
@@
-3038,7
+3043,7
@@
sub price_row {
for $i (1 .. $numrows) {
print qq|
<tr>
for $i (1 .. $numrows) {
print qq|
<tr>
- <td width=50%><input
name="pricegroup_$i" size=30 value=$form->{"pricegroup_$i"} readonly>
</td>
+ <td width=50%><input
type=hidden name="pricegroup_$i" size=30 value="$form->{"pricegroup_$i"}">$form->{"pricegroup_$i"}
</td>
<td width=50%><input name="price_$i" size=11 value="$form->{"price_$i"}"></td>
<input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
</tr>
<td width=50%><input name="price_$i" size=11 value="$form->{"price_$i"}"></td>
<input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
</tr>