From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 22 Sep 2011 13:56:21 +0000 (+0200)
Subject: bp/search in templates umgebaut
X-Git-Tag: release-2.7.0beta1~267
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e6f4310417ed916979a24a8699c549f38609d34a;p=kivitendo-erp.git

bp/search in templates umgebaut
---

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 9ce49155a..87afc3293 100644
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -65,212 +65,35 @@ sub assert_bp_access {
 }
 
 sub search {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  my ($name, $account, $onload);
+  $::lxdebug->enter_sub;
 
   assert_bp_access();
 
-  # $locale->text('Sales Invoices')
-  # $locale->text('Sales Orders')
-  # $locale->text('Purchase Orders')
-  # $locale->text('Quotations')
-  # $locale->text('RFQs')
-  # $locale->text('Checks')
-  # $locale->text('Receipts')
-
   # setup customer/vendor selection
-  BP->get_vc(\%myconfig, \%$form);
-
-  if (@{ $form->{"all_$form->{vc}"} || [] }) {
-    map { $name .= "<option>$_->{name}--$_->{id}\n" }
-      @{ $form->{"all_$form->{vc}"} };
-    $name = qq|<select name=$form->{vc}><option>\n$name</select>|;
-  } else {
-    $name = qq|<input name=$form->{vc} size=35>|;
-  }
-
-  # $locale->text('Customer')
-  # $locale->text('Vendor')
+  BP->get_vc(\%::myconfig, $::form);
 
   my %label = (
-       invoice =>
-         { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' },
-       sales_order =>
-         { title => 'Sales Orders', name => 'Customer', l_ordnumber => 'Y' },
-       purchase_order =>
-         { title => 'Purchase Orders', name => 'Vendor', l_ordnumber => 'Y' },
-       sales_quotation =>
-         { title => 'Quotations', name => 'Customer', l_quonumber => 'Y' },
-       request_quotation =>
-         { title => 'RFQs', name => 'Vendor', l_quonumber => 'Y' },
-       check   => { title => 'Checks',   name => 'Vendor' },
-       receipt => { title => 'Receipts', name => 'Customer' });
-
-  $label{invoice}{invnumber} = qq|
-        <tr>
-          <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-          <td colspan=3><input name=invnumber size=20></td>
-        </tr>
-|;
-  $label{invoice}{ordnumber} = qq|
-        <tr>
-          <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-          <td colspan=3><input name=ordnumber size=20></td>
-        </tr>
-|;
-  $label{sales_quotation}{quonumber} = qq|
-        <tr>
-          <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
-          <td colspan=3><input name=quonumber size=20></td>
-        </tr>
-|;
-
-  $label{check}{chknumber} = qq|
-          <tr>
-          <th align=right nowrap>| . $locale->text('Reference') . qq|</th>
-          <td colspan=3><input name=chknumber size=20></td>
-        </tr>
-|;
-
-  $label{sales_order}{ordnumber}       = $label{invoice}{ordnumber};
-  $label{purchase_order}{ordnumber}    = $label{invoice}{ordnumber};
-  $label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber};
-  $label{receipt}{rctnumber}           = $label{check}{chknumber};
-
-  # do one call to text
-  $form->{title} =
-      $locale->text('Print') . " "
-    . $locale->text($label{ $form->{type} }{title});
-
-  if ($form->{type} =~ /(check|receipt)/) {
-    if (BP->payment_accounts(\%myconfig, \%$form)) {
-      $account = qq|
-        <tr>
-          <th align=right>| . $locale->text('Account') . qq|</th>
-|;
-
-      if ($form->{accounts}) {
-        $account .= qq|
-          <td colspan=3><select name=account>
-|;
-        foreach my $ref (@{ $form->{accounts} }) {
-          $account .= qq|
-          <option>$ref->{accno}--$ref->{description}
-|;
-        }
-
-        $account .= qq|
-          </select>
-|;
-      } else {
-        $account .= qq|
-          <td colspan=3><input name=account></td>
-|;
-
-      }
-
-      $account .= qq|
-         </tr>
-|;
-
-    }
-  }
-
-  # use JavaScript Calendar or not
-  $form->{jsscript} = 1;
-  my $jsscript = "";
-  my ($button1, $button2);
-  if ($form->{jsscript}) {
-
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-      |;
-    $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdateto name=transdateto id="trigger2" value=|
-      . $locale->text('button') . qq|></td>
-     |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
-                          "transdateto", "BL", "trigger2");
-  } else {
-
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
-    $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
-  }
-  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
-  $form->header;
-  $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
-  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
-  print qq|
-<body onLoad="$onload">
-
-<form method=post action=bp.pl>
-
-<input type=hidden name=vc value=$form->{vc}>
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=title value="$form->{title}">
-
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align=right>Kunde</th>
-          <td colspan=3>$name</td>
-        </tr>
-        $account
-        $label{$form->{type}}{invnumber}
-        $label{$form->{type}}{ordnumber}
-        $label{$form->{type}}{quonumber}
-        $label{$form->{type}}{chknumber}
-        $label{$form->{type}}{rctnumber}
-        <tr>
-          <th align=right nowrap>| . $locale->text('From') . qq|</th>
-          $button1
-          <th align=right>| . $locale->text('Bis') . qq|</th>
-          $button2
-        </tr>
-        <input type=hidden name=sort value=transdate>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<input type=hidden name=nextsub value=list_spool>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-
-</form>
-
-</body>
+       invoice           => { title => $::locale->text('Sales Invoices'),  invnumber => 1, ordnumber => 1 },
+       sales_order       => { title => $::locale->text('Sales Orders'),    ordnumber => 1, },
+       purchase_order    => { title => $::locale->text('Purchase Orders'), ordnumber => 1, },
+       sales_quotation   => { title => $::locale->text('Quotations'),      quonumber => 1, },
+       request_quotation => { title => $::locale->text('RFQs'),            quonumber => 1, },
+       check             => { title => $::locale->text('Checks'),          chknumber => 1, },
+       receipt           => { title => $::locale->text('Receipts'),        rctnumber => 1, },
+  );
 
-$jsscript
+  my $bp_accounts = $::form->{type} =~ /check|receipt/
+                 && BP->payment_accounts(\%::myconfig, $::form);
 
-</html>
-|;
+  $::form->header;
+  print $::form->parse_html_template('bp/search', {
+    label         => \%label,
+    show_accounts => $bp_accounts,
+    account_sub   => sub { ("$_[0]{accno}--$_[0]{description}")x2 },
+    vc_keys       => sub { "$_[0]{name}--$_[0]{id}" },
+  });
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub remove {
diff --git a/templates/webpages/bp/search.html b/templates/webpages/bp/search.html
new file mode 100644
index 000000000..d6f01afa1
--- /dev/null
+++ b/templates/webpages/bp/search.html
@@ -0,0 +1,82 @@
+[%- USE L %]
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE HTML %]
+<body>
+<form method=post action=bp.pl>
+
+<h1>[% 'Print' | $T8 %] [% label.$type.title %]</h1>[% L.hidden_tag('title', LxERP.t8('Print') _ ' ' _ label.$type.title) %]
+
+<table>
+  <tr>
+    <th align=right>[% 'Customer' | $T8 %]</th>
+    <td colspan=3>
+  [%- IF vc == 'customer' ? all_customer.size : all_vendor.size %]
+      [%- INCLUDE 'generic/multibox.html'
+           name          = vc,
+           DATA          = vc == 'customer' ? all_customer : all_vendor,
+           id_sub        = 'vc_keys',
+           label_sub     = 'vc_keys',
+           select        = vc_select,
+           limit         = vclimit,
+           show_empty    = 1,
+           allow_textbox = 1,
+      -%]
+  [%- ELSE %]
+    [% L.input_tag(vc, '', size=35) %]
+  [%- END %]
+</td>
+  </tr>
+[% IF show_accounts %]
+  <tr>
+    <th align=right>[% 'Account' | $T8 %]</th>
+    <td colspan=3>[% L.select_tag('account', L.options_for_select(accounts, value_title_sub=\account_sub)) %]</td>
+  </tr>
+[% END %]
+[%- IF label.$type.invnumber %]
+  <tr>
+    <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
+    <td colspan=3>[% L.input_tag('invnumber', '', size=20) %]</td>
+  </tr>
+[%- END %]
+[%- IF label.$type.ordnumber %]
+  <tr>
+    <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
+    <td colspan=3>[% L.input_tag('ordnumber', '', size=20) %]</td>
+  </tr>
+[%- END %]
+[%- IF label.$type.quonumber %]
+  <tr>
+    <th align=right nowrap>[% 'Quotation Number' | $T8 %]</th>
+    <td colspan=3>[% L.input_tag('quonumber', '', size=20) %]</td>
+  </tr>
+[%- END %]
+[%- IF label.$type.chknumber %]
+  <tr>
+    <th align=right nowrap>[% 'Reference Number' | $T8 %]</th>
+    <td colspan=3>[% L.input_tag('chknumber', '', size=20) %]</td>
+  </tr>
+[%- END %]
+  <tr>
+    <th align=right nowrap>[% 'From' | $T8 %]</th>
+    <td>[% L.date_tag('transdatefrom') %]</td>
+    <th align=right>[% 'Bis' | $T8 %]</th>
+    <td>[% L.date_tag('transdateto') %]</td>
+  </tr>
+</table>
+
+<hr size=3 noshade>
+<br>
+
+[% L.hidden_tag('sort', 'transdate') %]
+[% L.hidden_tag('vc', vc) %]
+[% L.hidden_tag('type', type) %]
+[% L.hidden_tag('nextsub', 'list_spool') %]
+
+[% L.submit_tag('action', LxERP.t8('Continue')) %]
+
+</form>
+
+</body>
+
+</html>