projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Layout noch angepasst, so dass die Maske auf den Bildschirm passt
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
ae8c774
..
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
@@
sub edit {
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
@@
sub invoice_links {
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";
@@
-210,7
+210,12
@@
sub prepare_invoice {
$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,6
@@
sub prepare_invoice {
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)) {
# set option selected
foreach $item (qw(AR customer currency department employee contact)) {
@@
-520,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) {
@@
-925,7
+929,6
@@
sub update {
$sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
$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]{$_} }