X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=459e1b9446ef40f03b7c6807360c497df5b9540a;hb=f65faf202a24a1f1316f45e3695d3d9390dc0793;hp=f4556cf2cfbfc29baa774c3fb8ea4bf605317ffe;hpb=cfc6a60d53597f6a879b28af37f84b4b5fa4cc6b;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index f4556cf2c..459e1b944 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -37,6 +37,7 @@ use Data::Dumper; require "$form->{path}/io.pl"; require "$form->{path}/arap.pl"; +require "bin/mozilla/drafts.pl"; 1; @@ -44,7 +45,9 @@ require "$form->{path}/arap.pl"; sub add { $lxdebug->enter_sub(); - + + return $lxdebug->leave_sub() if (load_draft_maybe()); + if ($form->{type} eq "credit_note") { $form->{title} = $locale->text('Add Credit Note'); @@ -77,7 +80,10 @@ sub add { sub edit { $lxdebug->enter_sub(); - + # show history button + $form->{javascript} = qq||; + #/show hhistory button + if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") { $form->error("Access Denied"); @@ -115,6 +121,7 @@ sub invoice_links { if ($form->{all_customer}) { unless ($form->{customer_id}) { $form->{customer_id} = $form->{all_customer}->[0]->{id}; + $form->{salesman_id} = $form->{all_customer}->[0]->{salesman_id}; } } @@ -165,13 +172,13 @@ sub invoice_links { chomp $curr[0]; $form->{defaultcurrency} = $curr[0]; - map { $form->{selectcurrency} .= "\n" } @curr; $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; if (@{ $form->{all_customer} }) { $form->{customer} = "$form->{customer}--$form->{customer_id}"; - map { $form->{selectcustomer} .= "\n" } (@{ $form->{all_customer} }); } @@ -182,7 +189,7 @@ sub invoice_links { map { $form->{selectdepartment} .= - "\n" } (@{ $form->{all_departments} }); } @@ -191,7 +198,7 @@ sub invoice_links { # sales staff if ($form->{all_employees}) { $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "\n" } (@{ $form->{all_employees} }); } @@ -201,7 +208,8 @@ sub invoice_links { foreach $key (keys %{ $form->{AR_links} }) { foreach $ref (@{ $form->{AR_links}{$key} }) { - $form->{"select$key"} .= "\n"; } if ($key eq "AR_paid") { @@ -342,15 +350,15 @@ sub form_header { } else { $form->{selecttaxzone} =~ s/ selected//g; if ($form->{taxzone_id} ne "") { - $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/; + $form->{selecttaxzone} =~ s/value=\"$form->{taxzone_id}\"/value=\"$form->{taxzone_id}\" selected/; } } $taxzone = qq|
| . $locale->text('Max. Dunning Level') . qq|: | +| . $locale->text('Max. Dunning Level') . qq|: | $form->{max_dunning_level} | -| . $locale->text('Dunning Amount') . qq|: | +| . $locale->text('Dunning Amount') . qq|: | | . $form->format_amount(\%myconfig, $form->{dunning_amount},2) . qq| | @@ -499,11 +531,10 @@ sub form_header { # with JavaScript Calendar $button1 = qq| -{invdate}> | -text('button') . qq|> | - |; - ++ | |; + #write Trigger $jsscript = Form->write_trigger(\%myconfig, "1", @@ -513,28 +544,28 @@ sub form_header { # without JavaScript Calendar $button1 = - qq| | {invdate}> | |; + qq||; $button2 = - qq| | {duedate}> | |; + qq||; } } else { if ($form->{jsscript}) { # with JavaScript Calendar $button1 = qq| - | {invdate}> | -text('button') . qq|> | ++ | |; $button2 = qq| - | {duedate}> | -text('button') . qq|> | ++ | |; $button3 = qq| - | {deliverydate}> | -text('button') . qq|> | ++ | |; #write Trigger @@ -549,7 +580,7 @@ sub form_header { # without JavaScript Calendar $button1 = - qq| | {invdate}> | |; + qq||; $button2 = qq| | {duedate}> | |; } @@ -574,7 +605,9 @@ sub form_header { $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate"); - + # show history button js + $form->{javascript} .= qq||; + #/show history button js $form->header; print qq| @@ -584,69 +617,45 @@ sub form_header { -
---|