Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8145351d

Von David Ohlbrecht vor fast 15 Jahren hinzugefügt

  • ID 8145351db7044546499d15e3147a3f59f988310d
  • Vorgänger 481f935e
  • Nachfolger 130ba50d

Suche nach Verkäufer in Mahnungen und Anzeige von Kundennummer in der Auftragssuche.

Unterschiede anzeigen:

SL/DN.pm
600 600
    push(@values, $form->{dunningto});
601 601
  }
602 602

  
603
  if ($form->{salesman_id}) {
604
    $where .= qq| AND a.salesman_id = ?|;
605
    push(@values, conv_i($form->{salesman_id}));
606
  }
607

  
603 608
  my %sort_columns = (
604 609
    'dunning_description' => [ qw(dn.dunning_description customername invnumber) ],
605 610
    'customername'        => [ qw(customername invnumber) ],
SL/OE.pm
90 90
    qq|  ex.$rate AS exchangerate, | .
91 91
    qq|  pr.projectnumber AS globalprojectnumber, | .
92 92
    qq|  e.name AS employee, s.name AS salesman, | .
93
    qq|  ct.country, ct.ustid  | .
93
    qq|  ct.customernumber, ct.country, ct.ustid  | .
94 94
    qq|FROM oe o | .
95 95
    qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
96 96
    qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
bin/mozilla/dn.pl
284 284
  $main::auth->assert('dunning_edit');
285 285

  
286 286
  $form->get_lists("customers"   => "ALL_CUSTOMERS",
287
                   "departments" => "ALL_DEPARTMENTS");
287
                   "departments" => "ALL_DEPARTMENTS",
288
                   "salesmen"     => "ALL_SALESMEN");
288 289

  
289 290
  DN->get_config(\%myconfig, \%$form);
290 291

  
......
295 296
  $form->{jsscript} = 1;
296 297
  $form->{title}    = $locale->text('Dunnings');
297 298
  $form->{fokus}    = "search.customer";
299
  $form->{salesman_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} };
298 300

  
299 301
  $form->header();
300 302

  
bin/mozilla/oe.pl
745 745
    "shipvia",                 "globalprojectnumber",
746 746
    "transaction_description", "open",
747 747
    "delivered", "marge_total", "marge_percent",
748
    "country",                 "ustid",
748
    "customernumber",          "ustid",
749
    "country",
749 750
  );
750 751

  
751 752
  # only show checkboxes if gotten here via sales_order form.
......
807 808
    'delivered'               => { 'text' => $locale->text('Delivered'), },
808 809
    'marge_total'             => { 'text' => $locale->text('Ertrag'), },
809 810
    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
811
    'customernumber'                 => { 'text' => $locale->text('Customer Number'), },
810 812
    'country'                 => { 'text' => $locale->text('Country'), },
811 813
    'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
812 814
  );
templates/webpages/dunning/search_de.html
92 92
        <input type="button" name="dunningto" id="trigger4" value="?">
93 93
       </td>
94 94
      </tr>
95

  
95
      <tr>
96
       <th align="right">Verk?ufer/in</th>
97
       <td>
98
        [%- INCLUDE 'generic/multibox.html'
99
            name          = 'salesman_id',
100
            style         = 'width: 250px',
101
            DATA          =  ALL_SALESMEN,
102
            id_key        = 'id',
103
            label_sub     = 'salesman_labels',
104
            limit         = vclimit,
105
            show_empty    = 1,
106
            allow_textbox = 0,
107
         -%]
108
       </td>
109
      </tr>
96 110
     </table>
97 111
    </td>
98 112
   </tr>
......
105 119
      <tr>
106 120
       <th align="right" nowrap>Alte Mahnungen anzeigen</th>
107 121
       <td><input type="checkbox" value="1" name="showold"></td>
108
       <th align="right" nowrap>Show Salesman</th>
122
       <th align="right" nowrap>Verk?ufer anzeigen</th>
109 123
       <td><input type="checkbox" value="1" name="l_salesman"></td>
110 124
      </tr>
111 125
     </table>
templates/webpages/dunning/search_master.html
92 92
        <input type="button" name="dunningto" id="trigger4" value="?">
93 93
       </td>
94 94
      </tr>
95

  
95
      <tr>
96
       <th align="right"><translate>Salesman</translate></th>
97
       <td>
98
        [%- INCLUDE 'generic/multibox.html'
99
            name          = 'salesman_id',
100
            style         = 'width: 250px',
101
            DATA          =  ALL_SALESMEN,
102
            id_key        = 'id',
103
            label_sub     = 'salesman_labels',
104
            limit         = vclimit,
105
            show_empty    = 1,
106
            allow_textbox = 0,
107
         -%]
108
       </td>
109
      </tr>
96 110
     </table>
97 111
    </td>
98 112
   </tr>
templates/webpages/oe/search_de.html
230 230
        <td colspan=4 align=left><b>Kunde</td>
231 231
       </tr>
232 232
       <tr>
233
        <td>
234
         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
235
         <label for="l_customernumber">Kundennummer</label>
236
        </td>
233 237
        <td>
234 238
         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
235 239
         <label for="l_country">Land</label>
templates/webpages/oe/search_master.html
230 230
        <td colspan=4 align=left><b><translate>Customer</translate></td>
231 231
       </tr>
232 232
       <tr>
233
        <td>
234
         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
235
         <label for="l_customernumber"><translate>Customer Number</translate></label>
236
        </td>
233 237
        <td>
234 238
         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
235 239
         <label for="l_country"><translate>Country</translate></label>

Auch abrufbar als: Unified diff