/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 16821864

Von Thomas Kasulke vor mehr als 17 Jahren hinzugefügt

ID 168218647abacbfb5599be7beae82ae832cf2efb
Vorgänger f411025c
Nachfolger e7367fb5

fix von salesmen und employee bzw. split in zwei eigenständige Funktionen durch get_list aufgerufen. Fixing von Bug 658

       my ($self, $dbh) = @_;
       my $query = qq|SELECT id, name FROM employee WHERE login = ?|;
       ($self->{employee_id}, $self->{employee}) = selectrow_query($self, $dbh, $query, $self->{login});
       $self->{employee_id} *= 1;
       ($self->{"employee_id"}, $self->{"employee"}) = selectrow_query($self, $dbh, $query, $self->{login});
       $self->{"employee_id"} *= 1;
       $main::lxdebug->leave_sub();
+    }
-...
       $main::lxdebug->leave_sub();
+    }
     sub _get_salesmen {
       $main::lxdebug->enter_sub();
       my ($self, $dbh, $key) = @_;
       $key = "all_salesmen" unless ($key);
       $self->{$key} =
         selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee|);
       $main::lxdebug->leave_sub();
+    }
     sub _get_business_types {
       $main::lxdebug->enter_sub();
-...
       if ($params{"employees"}) {
         $self->_get_employees($dbh, $params{"employees"});
+      }
       if ($params{"salesmen"}) {
         $self->_get_salesmen($dbh, $params{"salesmen"});
+      }
       if ($params{"business_types"}) {
         $self->_get_business_types($dbh, $params{"business_types"});

+      }
       # set option selected
       foreach $item ($form->{vc}, currency, department, employee, ($form->{vc} eq "customer" ? customer : vendor)) {
       foreach $item ($form->{vc}, currency, department, ($form->{vc} eq "customer" ? customer : vendor)) {
         $form->{"select$item"} =~ s/ selected//;
         $form->{"select$item"} =~
           s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
-...
                        "projects" => { "key" => "ALL_PROJECTS",
                                        "all" => 0,
                                        "old_id" => \@old_project_ids },
                        "employees" => "ALL_SALESMEN",
                        "employees" => "ALL_EMPLOYEES",
                        "salesmen" => "ALL_SALESMEN",
                        "taxzones" => "ALL_TAXZONES",
                        "payments" => "ALL_PAYMENTS",
                        "currencies" => "ALL_CURRENCIES",
-...
         NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
                              '-labels' => \%labels,
                              '-default' => $form->{"globalproject_id"}));
       $salesman = "";
       my $salesmen = "";
       %labels = ();
       @values = ();
       if ($form->{type} =~ /^sales_/) {
         %labels = ();
         @values = ("");
         foreach my $item (@{ $form->{ALL_SALESMEN} }) {
           push(@values, $item->{id});
           $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
         foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
           push(@values, $item->{"id"});
           $labels{$item->{"id"}} = ($item->{"name"} ne "" ? $item->{"name"} : $item->{"login"});
+        }
         $salesman =
         $salesmen =
           qq|<tr>
               <th align="right">| . $locale->text('Salesman') . qq|</th>
               <td>| .
           NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
           NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{"salesman_id"} ? $form->{"salesman_id"} : $form->{"employee_id"},
                                '-values' => \@values, '-labels' => \%labels))
           . qq|</td>
              </tr>|;
-...
       %labels = ();
       @values = ();
       foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
       foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {
         push(@values, $item->{"id"});
         $labels{$item->{"id"}} = $item->{"name"};
         $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
+      }
       my $employees = qq|
       my $employee = qq|
         <tr>
           <th align="right">| . $locale->text('Employee') . qq|</th>
           <td>| .
             NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"},
             NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
                                  '-values' => \@values, '-labels' => \%labels)) . qq|
           </td>
         </tr>|;
-...
       if ($form->{type} eq 'sales_order') {
         if ($form->{selectemployee}) {
           $employee = qq|
         <input type=hidden name=customer_klass value=$form->{customer_klass}>
             $employees
     |;
           $employee .= qq|
             <input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;
+        }
       } else {
         $employee = qq|
         <input type=hidden name=customer_klass value=$form->{customer_klass}>
             $employees
     |;
         $employee .= qq|
           <input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;
+      }
       if ($form->{resubmit} && ($form->{format} eq "html")) {
         $onload =
-...
     	    <table>
     	      $openclosed
     	      $employee
             $salesman
             $salesmen
     	      $ordnumber
     	      <tr>
               <th width="70%" align="right" nowrap>| . $locale->text('Project Number') . qq|</th>

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 16821864

Von Thomas Kasulke vor mehr als 17 Jahren hinzugefügt