projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge von 699 aus unstable: Bugfix 222, 210, 212
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
53230d2
..
7d79ba9
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-67,7
+67,7
@@
sub add {
sub edit {
$lxdebug->enter_sub();
sub edit {
$lxdebug->enter_sub();
-print STDERR "is.pl-edit\n";
+
$form->{title} = $locale->text('Edit Sales Invoice');
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
$form->{title} = $locale->text('Edit Sales Invoice');
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
@@
-84,7
+84,7
@@
print STDERR "is.pl-edit\n";
sub invoice_links {
$lxdebug->enter_sub();
sub invoice_links {
$lxdebug->enter_sub();
-print STDERR "is.pl-invoice_links\n";
+
$form->{vc} = 'customer';
# create links
$form->{vc} = 'customer';
# create links
@@
-184,7
+184,7
@@
print STDERR "is.pl-invoice_links\n";
sub prepare_invoice {
$lxdebug->enter_sub();
sub prepare_invoice {
$lxdebug->enter_sub();
-print STDERR "is.pl-prepare_invoice\n";
+
$form->{type} = "invoice";
$form->{formname} = "invoice";
$form->{format} = "html";
$form->{type} = "invoice";
$form->{formname} = "invoice";
$form->{format} = "html";
@@
-195,8
+195,8
@@
print STDERR "is.pl-prepare_invoice\n";
map { $form->{$_} =~ s/\"/"/g }
qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
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);
foreach $ref (@{ $form->{invoice_details} }) {
$i++;
foreach $ref (@{ $form->{invoice_details} }) {
$i++;
@@
-210,7
+210,12
@@
print STDERR "is.pl-prepare_invoice\n";
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+ (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $dec_qty = length $dec_qty;
+
+ $form->{"qty_$i"} =
+ $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
map { $form->{"${_}_$i"} =~ s/\"/"/g }
qw(partnumber description unit partnotes);
map { $form->{"${_}_$i"} =~ s/\"/"/g }
qw(partnumber description unit partnotes);
@@
-223,7
+228,7
@@
print STDERR "is.pl-prepare_invoice\n";
sub form_header {
$lxdebug->enter_sub();
sub form_header {
$lxdebug->enter_sub();
-print STDERR "is.pl-form_header\n";
+
# set option selected
foreach $item (qw(AR customer currency department employee contact)) {
$form->{"select$item"} =~ s/ selected//;
# set option selected
foreach $item (qw(AR customer currency department employee contact)) {
$form->{"select$item"} =~ s/ selected//;
@@
-519,7
+524,7
@@
$jsscript
sub form_footer {
$lxdebug->enter_sub();
sub form_footer {
$lxdebug->enter_sub();
-print STDERR "is.pl-form_footer\n";
+
$form->{invtotal} = $form->{invsubtotal};
if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
$form->{invtotal} = $form->{invsubtotal};
if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
@@
-923,7
+928,7
@@
sub update {
} else {
$sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
} else {
$sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
-#print STDERR " SELLPRICE-111- $sellprice\n";
+
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} }
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} }
@@
-981,7
+986,7
@@
sub update {
}
# get pricegroups for parts
}
# get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form
, "new"
);
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# build up html code for prices_$i
&set_pricegroup($i);
# build up html code for prices_$i
&set_pricegroup($i);