From 67b0f6a665e91d497b3a936a3cdc4e20308d723c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 10 Dec 2009 11:48:35 +0100 Subject: [PATCH] ir: form_header auf Templates umgestellt. --- bin/mozilla/ir.pl | 338 ++++-------------- templates/webpages/ir/form_header_de.html | 242 +++++++++++++ templates/webpages/ir/form_header_master.html | 236 ++++++++++++ 3 files changed, 545 insertions(+), 271 deletions(-) create mode 100644 templates/webpages/ir/form_header_de.html create mode 100644 templates/webpages/ir/form_header_master.html diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index f43ed775c..01adc735e 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -97,6 +97,8 @@ sub invoice_links { $main::auth->assert('vendor_invoice_edit'); + $form->{vc} = 'vendor'; + # create links $form->{webdav} = $main::webdav; $form->{jsscript} = 1; @@ -254,299 +256,93 @@ sub form_header { my $locale = $main::locale; my $cgi = $main::cgi; - $main::auth->assert('vendor_invoice_edit'); + $main::auth->assert('invoice_edit'); - push @{ $form->{AJAX} }, CGI::Ajax->new('set_duedate_vendor' => "$form->{script}?action=set_duedate_vendor"); + our %TMPL_VAR = (); + my @custom_hiddens; - # set option selected - foreach my $item (qw(AP vendor currency department)) { - $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } + $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; + $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; - $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; - $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); - $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0"); - $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0"); - - my $exchangerate = ""; - if ($form->{currency} ne $form->{defaultcurrency}) { - if ($form->{forex}) { - $exchangerate .= qq| | . $locale->text('Exchangerate') . qq| - $form->{exchangerate}{exchangerate}>\n|; - } else { - $exchangerate .= qq| | . $locale->text('Exchangerate') . qq| - {exchangerate}>\n|; - } - } - $exchangerate .= qq| {forex}>\n|; + + my $set_duedate_url = "$form->{script}?action=set_duedate"; + + push @ { $form->{AJAX} }, new CGI::Ajax( 'set_duedate' => $set_duedate_url ); my @old_project_ids = ($form->{"globalproject_id"}); map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"}; $form->get_lists("contacts" => "ALL_CONTACTS", - "projects" => { "key" => "ALL_PROJECTS", - "all" => 0, - "old_id" => \@old_project_ids }, + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }, + "employees" => "ALL_EMPLOYEES", "taxzones" => "ALL_TAXZONES", - "employees" => "ALL_SALESMEN", "currencies" => "ALL_CURRENCIES", "vendors" => "ALL_VENDORS", "price_factors" => "ALL_PRICE_FACTORS"); - my %labels; - my @values = (undef); - foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { - push(@values, $item->{"cp_id"}); - $labels{$item->{"cp_id"}} = $item->{"cp_name"} . ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); - } - - my $contact; - if (scalar @values > 1) { - $contact = qq| - - | . $locale->text('Contact Person') . qq| - | . NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px', - '-labels' => \%labels, '-default' => $form->{"cp_id"})) . qq| - - |; - } - - %labels = (); - @values = (""); - foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"projectnumber"}; - } - my $globalprojectnumber = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, '-labels' => \%labels, - '-default' => $form->{"globalproject_id"})); - - %labels = (); - @values = (); - my $i = 0; - foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) { - push(@values, $item); - $labels{$item} = $item; - } - - $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - my $currencies; - if (scalar @values) { - $currencies = qq| - - | . $locale->text('Currency') . qq| - | . NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, - '-values' => \@values, '-labels' => \%labels)) . qq| - - |; - } - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"name"}; - } - my $employees = qq| - - | . $locale->text('Employee') . qq| - | . NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"}, - '-values' => \@values, '-labels' => \%labels)) . qq| - - |; - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_VENDORS"} }) { - push(@values, $item->{name}.qq|--|.$item->{"id"}); - $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; - } - - $form->{selectvendor} = ($myconfig{vclimit} > scalar(@values)); - - my $vendors = qq| - | . $locale->text('Vendor') . qq| - | . - (($myconfig{vclimit} <= scalar(@values)) - ? qq|| - : (NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{oldvendor}, - '-onChange' => 'document.getElementById(\'update_button\').click();', - '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| - - |; - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_TAXZONES"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"description"}; - } - - my $taxzone; - if (!$form->{"id"}) { - $taxzone = qq| - - | . $locale->text('Steuersatz') . qq| - | . NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, - '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq| - - |; - } else { - $taxzone = qq| - - | . $locale->text('Steuersatz') . qq| - - - | . H($labels{$form->{"taxzone_id"}}) . qq| - - |; - } - - my $department = qq| - - | . $locale->text('Department') . qq| - - - - \n| if $form->{selectdepartment}; - - my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1"; - - # use JavaScript Calendar or not - $form->{jsscript} = 1; - my $jsscript = ""; - - my $button1 = qq| - - - - \n|; - -#, 'old_duedate__'' + document.getElementsByName('duedate')[0].value, 'vendor_id__' + document.getElementsByName('vendor_id')[0].value],['duedate'])"> - my $button2 = qq| - - - text('button') . qq|> - \n|; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "2", - "invdate", "BL", "trigger1", - "duedate", "BL", "trigger2"); + $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; +# $TMPL_VAR{shipto_labels} = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) }; + $TMPL_VAR{contact_labels} = sub { join(', ', $_[0]->{"cp_name"}, $_[0]->{"cp_givenname"}) . ($_[0]->{cp_abteilung} ? " ($_[0]->{cp_abteilung})" : "") }; + $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" }; + + # customer + $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; + $TMPL_VAR{vclimit} = $myconfig{vclimit}; + $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('vendor', '', 1, 0)"; + push @custom_hiddens, "vendor_id"; + push @custom_hiddens, "oldvendor"; + push @custom_hiddens, "selectvendor"; + + # currencies and exchangerate + my @values = map { $_ } @{ $form->{ALL_CURRENCIES} }; + my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} }; + $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; + $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency}; + $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, + '-values' => \@values, '-labels' => \%labels)) if scalar @values; + push @custom_hiddens, "forex"; + push @custom_hiddens, "exchangerate" if $form->{forex}; + + $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}; + $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/; + + $form->{fokus} = "invoice.vendor"; my $follow_up_vc = $form->{vendor}; $follow_up_vc =~ s/--\d*\s*$//; - my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; - - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - - $jsscript .= $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate"); - - $form->header; - my $onload = qq|focus()|; - $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; - $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - print qq| - - -
-|; - - $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id - max_dunning_level dunning_amount vendor_id oldvendor selectvendor taxaccounts - fxgain_accno fxloss_accno taxpart taxservice cursor_fokus - convert_from_oe_ids convert_from_do_ids), - map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ); - - print qq|

$form->{saved_message}

| if $form->{saved_message}; - - print qq| + $TMPL_VAR{vendor_name} = $follow_up_vc; -
$form->{title}
- - - - - - -
- - $vendors - $contact - - - - - - - - - - $taxzone - $department - - $currencies - $exchangerate - -
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}; | . $locale->text('Remaining') . qq| $form->{creditremaining}
| . $locale->text('Record in') . qq|
-
- - $employees - - - - - - - $button1 - - - - $button2 - - - - - - - - - - - - - - - - - - -
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Invoice Date') . qq|
| . $locale->text('Due Date') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Order Date') . qq| -
| . $locale->text('Quotation Date') . qq| -
| . $locale->text('Project Number') . qq|$globalprojectnumber
-
- - +# set option selected + foreach my $item (qw(AP)) { + $form->{"select$item"} =~ s/ selected//; + $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; + } -$jsscript + $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; + $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; + + # hiddens + $TMPL_VAR{HIDDENS} = [qw( + id action type media format queued printed emailed title vc discount + title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id + max_dunning_level dunning_amount + shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax + shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus + convert_from_do_ids convert_from_oe_ids + ), @custom_hiddens, + map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - -|; + $form->{jsscript} = 1; + $form->header(); - foreach my $item (split / /, $form->{taxaccounts}) { - print qq| -{"${item}_rate"}> - -|; - } + print $form->parse_html_template("ir/form_header", \%TMPL_VAR); $main::lxdebug->leave_sub(); } diff --git a/templates/webpages/ir/form_header_de.html b/templates/webpages/ir/form_header_de.html new file mode 100644 index 000000000..150b5d9b1 --- /dev/null +++ b/templates/webpages/ir/form_header_de.html @@ -0,0 +1,242 @@ +[%- USE HTML %] +[%- USE LxERP %] +[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %] + + + + + + + + + + +

[% saved_message %]

+ +[%- FOREACH key = HIDDENS %] + +[%- END %] + + + + + + + +

[% title %]

+ + + + + + +
+ + + + + + + + + +[%- IF ALL_CONTACTS.size %] + + + + +[%- END %] + + + + + + + + + + + + + [%- IF id %] + + [%- END %] + +[%- IF all_departments %] + + + + +[%- END %] +[%- IF currencies %] + + + + +[%- END %] + + +[%- IF show_exchangerate %] + + + + +[%- END %] +
Lieferant + [%- INCLUDE 'generic/multibox.html' + name = 'vendor', + style = 'width: 250px', + DATA = ALL_VENDORS, + id_sub = 'vc_keys', + label_key = 'name', + select = vc_select, + limit = vclimit, + allow_textbox = 1, + onChange = "document.getElementById('update_button').click();" -%] + +[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [ + { script => 'ct.pl', column => 'name', selector => 'input[id="' _ vc _ '"]', params => { vc => vc } }, +] +%] +
Ansprechpartner + [%- INCLUDE 'generic/multibox.html' + name = 'cp_id', + style = 'width: 250px', + DATA = ALL_CONTACTS, + id_key = 'cp_id', + label_sub = 'contact_labels', + show_empty = 1 -%] +
Kreditlimit + [% LxERP.format_amount(creditlimit, 0, '0') %]; Rest + [% LxERP.format_amount(creditremaining,0 ,'0') %] +
Buchen auf
Steuersatz + [%- INCLUDE 'generic/multibox.html' + name = 'taxzone_id' + style = 'width: 250px' + DATA = ALL_TAXZONES + id_key = 'id' + readonly = (id ? 1 : 0) + label_key = 'description' -%] +
Abteilung + [%- INCLUDE 'generic/multibox.html' + name = 'department_id', + style = 'width: 250px', + DATA = all_departments, + id_key = 'id', + label_sub = 'department_labels', + show_empty = 1 -%] +
Währung[% currencies %]
Wechselkurs + [%- IF forex %] + [% LxERP.format_amount(exchangerate, 2) %] + [%- ELSE %] + + [%- END %] +
+
+ + + + + + +[%- IF is_type_credit_note %] + + + + + + + + +[%- ELSE %] + + + + + + + + + + + + +[%- END %] + + + + + + + + + + + + + + + + + +
Bearbeiter + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + DATA = ALL_EMPLOYEES, + id_key = 'id', + label_sub = 'sales_employee_labels' -%] +
Gutschriftnummer
Gutschriftdatum + + +
Rechnungsnummer
Rechnungsdatum + + +
Fälligkeitsdatum + + +
Auftragsnummer
Auftragsdatum +
Angebotsdatum +
Projektnummer + [%- INCLUDE 'generic/multibox.html' + name = 'globalproject_id', + DATA = ALL_PROJECTS, + id_key = 'id', + label_key = 'projectnumber', + show_empty = 1, + onChange = "document.getElementById('update_button').click();" -%] +
+
+ + + + + + + + + + + + diff --git a/templates/webpages/ir/form_header_master.html b/templates/webpages/ir/form_header_master.html new file mode 100644 index 000000000..c092782fd --- /dev/null +++ b/templates/webpages/ir/form_header_master.html @@ -0,0 +1,236 @@ +[%- USE HTML %] +[%- USE LxERP %] +[%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %] + + + + + + + + + + +

[% saved_message %]

+ +[%- FOREACH key = HIDDENS %] + +[%- END %] + + + + + + + +

[% title %]

+ + + + + + +
+ + + + + + + + + +[%- IF ALL_CONTACTS.size %] + + + + +[%- END %] + + + + + + + + + + + + + [%- IF id %] + + [%- END %] + +[%- IF all_departments %] + + + + +[%- END %] +[%- IF currencies %] + + + + +[%- END %] + + +[%- IF show_exchangerate %] + + + + +[%- END %] +
Vendor + [%- INCLUDE 'generic/multibox.html' + name = 'vendor', + style = 'width: 250px', + DATA = ALL_VENDORS, + id_sub = 'vc_keys', + label_key = 'name', + select = vc_select, + limit = vclimit, + allow_textbox = 1, + onChange = "document.getElementById('update_button').click();" -%] + +[% INCLUDE 'generic/autocomplete.html', AUTOCOMPLETES => [ + { script => 'ct.pl', column => 'name', selector => 'input[id="' _ vc _ '"]', params => { vc => vc } }, +] +%] +
Contact Person + [%- INCLUDE 'generic/multibox.html' + name = 'cp_id', + style = 'width: 250px', + DATA = ALL_CONTACTS, + id_key = 'cp_id', + label_sub = 'contact_labels', + show_empty = 1 -%] +
Credit Limit + [% LxERP.format_amount(creditlimit, 0, '0') %]; Remaining + [% LxERP.format_amount(creditremaining,0 ,'0') %] +
Record in
Steuersatz + [%- INCLUDE 'generic/multibox.html' + name = 'taxzone_id' + style = 'width: 250px' + DATA = ALL_TAXZONES + id_key = 'id' + readonly = (id ? 1 : 0) + label_key = 'description' -%] +
Department + [%- INCLUDE 'generic/multibox.html' + name = 'department_id', + style = 'width: 250px', + DATA = all_departments, + id_key = 'id', + label_sub = 'department_labels', + show_empty = 1 -%] +
Currency[% currencies %]
Exchangerate + [%- IF forex %] + [% LxERP.format_amount(exchangerate, 2) %] + [%- ELSE %] + + [%- END %] +
+
+ + + + + + +[%- IF is_type_credit_note %] + + + + + + + + +[%- ELSE %] + + + + + + + + + + + + +[%- END %] + + + + + + + + + + + + + + + + + +
Employee + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + DATA = ALL_EMPLOYEES, + id_key = 'id', + label_sub = 'sales_employee_labels' -%] +
Credit Note Number
Credit Note Date + + +
Invoice Number
Invoice Date + + +
Due Date + + +
Order Number
Order Date +
Quotation Date +
Project Number + [%- INCLUDE 'generic/multibox.html' + name = 'globalproject_id', + DATA = ALL_PROJECTS, + id_key = 'id', + label_key = 'projectnumber', + show_empty = 1, + onChange = "document.getElementById('update_button').click();" -%] +
+
+ + + + + + + + + + + + -- 2.20.1