X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fbp.pl;h=10acafdaa079005eb069856c80df4b768f83835f;hb=08c340d2caca21066fd8797e29f07facfde7a07c;hp=93789019ed5fb6c6146ed1dc51889a0f0c55b9e7;hpb=0d9ac875bf41d614388e6cf3864806de4c04c0e9;p=kivitendo-erp.git

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 93789019e..10acafdaa 100644
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -32,13 +32,56 @@
 #======================================================================
 
 use SL::BP;
+use Data::Dumper;
+use List::Util qw(first);
 
 1;
 
+require "bin/mozilla/common.pl";
+
+use strict;
+
 # end of main
 
+sub assert_bp_access {
+  my $form     = $main::form;
+
+  my %access_map = (
+    'invoice'           => 'invoice_edit',
+    'sales_order'       => 'sales_order_edit',
+    'sales_quotation'   => 'sales_quotation_edit',
+    'purchase_order'    => 'purchase_order_edit',
+    'request_quotation' => 'request_quotation_edit',
+    'check'             => 'cash',
+    'receipt'           => 'cash',
+  );
+
+  if ($form->{type} && $access_map{$form->{type}}) {
+    $main::auth->assert($access_map{$form->{type}});
+
+  } elsif ($form->{type} eq 'packing_list') {
+    $main::lxdebug->message(0, "1");
+    if (!$main::auth->assert('sales_order_edit', 1)) {
+    $main::lxdebug->message(0, "2");
+      $main::auth->assert('invoice_edit') ;
+    }
+    $main::lxdebug->message(0, "3");
+
+  } else {
+    $main::auth->assert('DOES_NOT_EXIST');
+  }
+}
+
 sub search {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my ($name, $account, $onload);
+
+  assert_bp_access();
 
   # $locale->text('Sales Invoices')
   # $locale->text('Packing Lists')
@@ -63,7 +106,7 @@ sub search {
   # $locale->text('Customer')
   # $locale->text('Vendor')
 
-  %label = (
+  my %label = (
        invoice =>
          { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' },
        packing_list =>
@@ -128,7 +171,7 @@ sub search {
         $account .= qq|
 	  <td colspan=3><select name=account>
 |;
-        foreach $ref (@{ $form->{accounts} }) {
+        foreach my $ref (@{ $form->{accounts} }) {
           $account .= qq|
           <option>$ref->{accno}--$ref->{description}
 |;
@@ -152,22 +195,21 @@ sub search {
   }
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";
+  $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}">
+       <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>
+      . $locale->text('button') . qq|></td>
       |;
     $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
+       <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>
+      . $locale->text('button') . qq|></td>
      |;
 
     #write Trigger
@@ -178,17 +220,18 @@ sub search {
 
     # without JavaScript Calendar
     $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
+                              <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}"></td>|;
+                              <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>
+<body onLoad="$onload">
 
-<form method=post action=$form->{script}>
+<form method=post action=bp.pl>
 
 <input type=hidden name=vc value=$form->{vc}>
 <input type=hidden name=type value=$form->{type}>
@@ -227,10 +270,6 @@ sub search {
 
 <input type=hidden name=nextsub value=list_spool>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <br>
 <input class=submit type=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -244,15 +283,20 @@ $jsscript
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub remove {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $selected = 0;
+  assert_bp_access();
 
-  for $i (1 .. $form->{rowcount}) {
+  my $selected = 0;
+
+  for my $i (1 .. $form->{rowcount}) {
     if ($form->{"checked_$i"}) {
       $selected = 1;
       last;
@@ -268,12 +312,13 @@ sub remove {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=bp.pl>
 |;
 
   map { delete $form->{$_} } qw(action header);
 
-  foreach $key (keys %$form) {
+  foreach my $key (keys %$form) {
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
   }
 
@@ -281,7 +326,8 @@ sub remove {
 <h2 class=confirm>$form->{title}</h2>
 
 <h4>|
-    . $locale->text('Are you sure you want to remove the marked entries from the queue?')
+    . $locale->text(
+          'Are you sure you want to remove the marked entries from the queue?')
     . qq|</h4>
 
 <input name=action class=submit type=submit value="|
@@ -292,24 +338,43 @@ sub remove {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub yes {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  assert_bp_access();
 
   $form->info($locale->text('Removing marked entries from queue ...'));
   $form->{callback} .= "&header=1" if $form->{callback};
 
   $form->redirect($locale->text('Removed spoolfiles!'))
-    if (BP->delete_spool(\%myconfig, \%$form, $spool));
+    if (BP->delete_spool(\%myconfig, \%$form, $main::spool));
   $form->error($locale->text('Cannot remove files!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub print {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  assert_bp_access();
+
+  $form->get_lists(printers => 'ALL_PRINTERS');
+  # use the command stored in the databse or fall back to $myconfig{printer}
+  my $selected_printer =  first { $_ } map ({ $_ ->{printer_command} }
+                                         grep { $_->{id} eq $form->{printer} }
+                                           @{ $form->{ALL_PRINTERS} }),
+                                       $myconfig{printer};
 
   if ($form->{callback}) {
     map { $form->{callback} .= "&checked_$_=1" if $form->{"checked_$_"} }
@@ -317,12 +382,11 @@ sub print {
     $form->{callback} .= "&header=1";
   }
 
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
     if ($form->{"checked_$i"}) {
-      $form->{OUT} = "| $myconfig{printer}";
       $form->info($locale->text('Printing ... '));
 
-      if (BP->print_spool(\%myconfig, \%$form, $spool)) {
+      if (BP->print_spool(\%myconfig, \%$form, $main::spool, "| $selected_printer")) {
         print $locale->text('done');
         $form->redirect($locale->text('Marked entries printed!'));
       }
@@ -332,11 +396,17 @@ sub print {
 
   $form->error('Nothing selected!');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_spool {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  assert_bp_access();
 
   $form->{ $form->{vc} } = $form->unescape($form->{ $form->{vc} });
   ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) =
@@ -344,13 +414,13 @@ sub list_spool {
 
   BP->get_spoolfiles(\%myconfig, \%$form);
 
-  $title = $form->escape($form->{title});
-  $href  =
-    "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title";
+  my $title = $form->escape($form->{title});
+  my $href  = "bp.pl?action=list_spool&vc=$form->{vc}&type=$form->{type}&title=$title";
 
   $title = $form->escape($form->{title}, 1);
-  $callback =
-    "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title";
+  my $callback =
+    "bp.pl?action=list_spool&vc=$form->{vc}&type=$form->{type}&title=$title";
+  my $option;
 
   if ($form->{ $form->{vc} }) {
     $callback .= "&$form->{vc}=" . $form->escape($form->{ $form->{vc} }, 1);
@@ -403,9 +473,9 @@ sub list_spool {
       . $locale->date(\%myconfig, $form->{transdateto}, 1);
   }
 
-  $name = ucfirst $form->{vc};
+  my $name = ucfirst $form->{vc};
 
-  @columns = (transdate);
+  my @columns = qw(transdate);
   if ($form->{type} =~ /(invoice|packing_list|check|receipt)/) {
     push @columns, "invnumber";
   }
@@ -416,10 +486,13 @@ sub list_spool {
     push @columns, "quonumber";
   }
 
-  push @columns, (name, spoolfile);
-  @column_index = $form->sort_columns(@columns);
+  push @columns, qw(name spoolfile);
+  my @column_index = $form->sort_columns(@columns);
   unshift @column_index, "checked";
 
+  my %column_header;
+  my %column_data;
+
   $column_header{checked}   = "<th class=listheading>&nbsp;</th>";
   $column_header{transdate} =
       "<th><a class=listheading href=$href&sort=transdate>"
@@ -449,7 +522,7 @@ sub list_spool {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=bp.pl>
 
 <table width=100%>
   <tr>
@@ -477,9 +550,11 @@ sub list_spool {
   # escape callback for href
   $callback = $form->escape($callback);
 
-  $i = 0;
+  my $i = 0;
+  my $j = 0;
+  my $spoolfile;
 
-  foreach $ref (@{ $form->{SPOOL} }) {
+  foreach my $ref (@{ $form->{SPOOL} }) {
 
     $i++;
 
@@ -488,7 +563,7 @@ sub list_spool {
     if ($ref->{invoice}) {
       $ref->{module} = ($ref->{module} eq 'ar') ? "is" : "ir";
     }
-    $module = "$ref->{module}.pl";
+    my $module = "$ref->{module}.pl";
 
     $column_data{transdate} = "<td>$ref->{transdate}&nbsp;</td>";
 
@@ -500,14 +575,14 @@ sub list_spool {
     }
 
     $column_data{invnumber} =
-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
     $column_data{ordnumber} =
-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
     $column_data{quonumber} =
-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
     $column_data{name}      = "<td>$ref->{name}</td>";
     $column_data{spoolfile} =
-      qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
+      qq|<td><a href=$main::spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
 <input type=hidden name="spoolfile_$i" value=$ref->{spoolfile}>
 |;
 
@@ -548,27 +623,31 @@ sub list_spool {
 <input type=hidden name=sort value="$form->{sort}">
 
 <input type=hidden name=account value="$form->{account}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
 |;
 
-  if ($myconfig{printer}) {
+#  if ($myconfig{printer}) {
     print qq|
+<input type=hidden name=transdateto value=$form->{transdateto}>
+<input type=hidden name=transdatefrom value=$form->{transdatefrom}>
+<input type=hidden name=invnumber value=$form->{invnumber}>
+<input type=hidden name=ordnumber value=$form->{ordnumber}>
+<input type=hidden name=quonumber value=$form->{quonumber}>
+<input type=hidden name=customer value=$form->{customer}>
+<input type=hidden name=vendor value=$form->{vendor}>
 <input class=submit type=submit name=action value="|
       . $locale->text('Select all') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('Print') . qq|">
 <input class=submit type=submit name=action value="|
       . $locale->text('Remove') . qq|">
+<input class=submit type=submit name=action value="|
+      . $locale->text('Print') . qq|">
 |;
-  }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+$form->get_lists(printers=>"ALL_PRINTERS");
+print qq|<select name="printer">|;
+print map(qq|<option value="$_->{id}">| . H($_->{printer_description}) . qq|</option>|, @{ $form->{ALL_PRINTERS} });
+print qq|</select>|;
+
+#  }
 
   print qq|
 </form>
@@ -577,17 +656,21 @@ sub list_spool {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub select_all {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  assert_bp_access();
 
   map { $form->{"checked_$_"} = 1 } (1 .. $form->{rowcount});
   &list_spool;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($main::form->{"nextsub"}); }