projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
e9ea9f0
..
ecc5f55
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-76,8
+76,6
@@
sub add {
$form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
$form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
- $form->{jsscript} = "date";
-
&invoice_links;
&prepare_invoice;
&display_form;
&invoice_links;
&prepare_invoice;
&display_form;
@@
-138,7
+136,7
@@
sub invoice_links {
$form->{vc} = 'customer';
# create links
$form->{vc} = 'customer';
# create links
- $form->{webdav} = $::
lx_office_conf{features}->{webdav}
;
+ $form->{webdav} = $::
instance_conf->get_webdav
;
$form->create_links("AR", \%myconfig, "customer");
$form->create_links("AR", \%myconfig, "customer");
@@
-379,7
+377,6
@@
sub form_header {
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
- $form->{jsscript} = 1;
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
@@
-550,7
+547,10
@@
sub update {
}
if ($rows) {
}
if ($rows) {
- $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
if ($rows > 1) {
if ($rows > 1) {