Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6d169764

Von Moritz Bunkus vor mehr als 14 Jahren hinzugefügt

  • ID 6d169764351ba6f5bbf2a90f9d7a260617ab4070
  • Vorgänger 37c67888
  • Nachfolger 2b7ababf

"Vertreter"-Feature in Kunden-/Lieferantenstammdaten wieder eingebaut

Unterschiede anzeigen:

SL/Form.pm
765 765
  $additional_params->{"conf_lizenzen"}               = $main::lizenzen;
766 766
  $additional_params->{"conf_latex_templates"}        = $main::latex;
767 767
  $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
768
  $additional_params->{"conf_vertreter"}              = $main::vertreter;
768 769

  
769 770
  if (%main::debug_options) {
770 771
    map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
......
2220 2221

  
2221 2222
  my ($self, $dbh, $key) = @_;
2222 2223

  
2223
  $key = "all_business_types" unless ($key);
2224
  $self->{$key} =
2225
    selectall_hashref_query($self, $dbh, qq|SELECT * FROM business|);
2224
  my $options       = ref $key eq 'HASH' ? $key : { key => $key };
2225
  $options->{key} ||= "all_business_types";
2226
  my $where         = '';
2227

  
2228
  if (exists $options->{salesman}) {
2229
    $where = 'WHERE ' . ($options->{salesman} ? '' : 'NOT ') . 'COALESCE(salesman)';
2230
  }
2231

  
2232
  $self->{ $options->{key} } = selectall_hashref_query($self, $dbh, qq|SELECT * FROM business $where ORDER BY lower(description)|);
2226 2233

  
2227 2234
  $main::lxdebug->leave_sub();
2228 2235
}
bin/mozilla/ct.pl
285 285
  my %myconfig = %main::myconfig;
286 286
  my $locale   = $main::locale;
287 287

  
288
  $form->get_lists("employees" => "ALL_EMPLOYEES",
289
                   "taxzones"  => "ALL_TAXZONES");
288
  $form->get_lists(employees      => "ALL_EMPLOYEES",
289
                   taxzones       => "ALL_TAXZONES",
290
                   business_types => { key => 'ALL_SALESMAN_BUSINESSES', salesman => 1 });
290 291
  $form->get_pricegroup(\%myconfig, { all => 1 });
291 292

  
292 293
  $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
locale/de/all
1316 1316
  'Report and misc. Preferences' => 'Sonstige Einstellungen',
1317 1317
  'Report for'                  => 'Bericht f?r',
1318 1318
  'Reports'                     => 'Berichte',
1319
  'Representative'              => 'Vertreter',
1319 1320
  'Reqdate'                     => 'Lieferdatum',
1320 1321
  'Request for Quotation'       => 'Anfrage',
1321 1322
  'Request for Quotations'      => 'Anfragen',
......
1716 1717
  'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
1717 1718
  'Type'                        => 'Typ',
1718 1719
  'Type of Business'            => 'Kunden-/Lieferantentyp',
1720
  'Type of Customer'            => 'Kundentyp',
1721
  'Type of Vendor'              => 'Lieferantentyp',
1719 1722
  'USTVA'                       => 'USTVA',
1720 1723
  'USTVA 2004'                  => 'USTVA 2004',
1721 1724
  'USTVA 2005'                  => 'USTVA 2005',
......
1760 1763
  'User migration complete'     => 'Benutzermigration abgeschlossen',
1761 1764
  'User name'                   => 'Benutzername',
1762 1765
  'User saved!'                 => 'Benutzer gespeichert!',
1766
  'Username'                    => 'Benutzername',
1763 1767
  'Users in<br>this group'      => 'Benutzer in<br>dieser Gruppe',
1764 1768
  'Users not in this group'     => 'Benutzer nicht in dieser Gruppe',
1765 1769
  'Ust-IDNr'                    => 'USt-IdNr.',
locale/de/dn
341 341
  'quotation'                   => 'quotation',
342 342
  'reformat_numbers'            => 'reformat_numbers',
343 343
  'relink_accounts'             => 'relink_accounts',
344
  'remove_emptied_rows'         => 'remove_emptied_rows',
344 345
  'report_generator_back'       => 'report_generator_back',
345 346
  'report_generator_dispatcher' => 'report_generator_dispatcher',
346 347
  'report_generator_do'         => 'report_generator_do',
locale/de/do
382 382
  'redo_stock_info'             => 'redo_stock_info',
383 383
  'reformat_numbers'            => 'reformat_numbers',
384 384
  'relink_accounts'             => 'relink_accounts',
385
  'remove_emptied_rows'         => 'remove_emptied_rows',
385 386
  'report_generator_back'       => 'report_generator_back',
386 387
  'report_generator_dispatcher' => 'report_generator_dispatcher',
387 388
  'report_generator_do'         => 'report_generator_do',
locale/de/ic
397 397
  'quotation'                   => 'quotation',
398 398
  'reformat_numbers'            => 'reformat_numbers',
399 399
  'relink_accounts'             => 'relink_accounts',
400
  'remove_emptied_rows'         => 'remove_emptied_rows',
400 401
  'report_generator_back'       => 'report_generator_back',
401 402
  'report_generator_dispatcher' => 'report_generator_dispatcher',
402 403
  'report_generator_do'         => 'report_generator_do',
locale/de/io
299 299
  'quotation'                   => 'quotation',
300 300
  'reformat_numbers'            => 'reformat_numbers',
301 301
  'relink_accounts'             => 'relink_accounts',
302
  'remove_emptied_rows'         => 'remove_emptied_rows',
302 303
  'request_for_quotation'       => 'request_for_quotation',
303 304
  'retrieve_partunits'          => 'retrieve_partunits',
304 305
  'sales_invoice'               => 'sales_invoice',
locale/de/ir
352 352
  'reformat_numbers'            => 'reformat_numbers',
353 353
  'relink_accounts'             => 'relink_accounts',
354 354
  'remove_draft'                => 'remove_draft',
355
  'remove_emptied_rows'         => 'remove_emptied_rows',
355 356
  'request_for_quotation'       => 'request_for_quotation',
356 357
  'retrieve_partunits'          => 'retrieve_partunits',
357 358
  'sales_invoice'               => 'sales_invoice',
locale/de/is
358 358
  'reformat_numbers'            => 'reformat_numbers',
359 359
  'relink_accounts'             => 'relink_accounts',
360 360
  'remove_draft'                => 'remove_draft',
361
  'remove_emptied_rows'         => 'remove_emptied_rows',
361 362
  'request_for_quotation'       => 'request_for_quotation',
362 363
  'retrieve_partunits'          => 'retrieve_partunits',
363 364
  'sales_invoice'               => 'sales_invoice',
locale/de/login
487 487
  'redo_stock_info'             => 'redo_stock_info',
488 488
  'reformat_numbers'            => 'reformat_numbers',
489 489
  'relink_accounts'             => 'relink_accounts',
490
  'remove_emptied_rows'         => 'remove_emptied_rows',
490 491
  'report'                      => 'report',
491 492
  'report_for_todo_list'        => 'report_for_todo_list',
492 493
  'report_generator_back'       => 'report_generator_back',
locale/de/oe
447 447
  'redo_stock_info'             => 'redo_stock_info',
448 448
  'reformat_numbers'            => 'reformat_numbers',
449 449
  'relink_accounts'             => 'relink_accounts',
450
  'remove_emptied_rows'         => 'remove_emptied_rows',
450 451
  'report_for_todo_list'        => 'report_for_todo_list',
451 452
  'report_generator_back'       => 'report_generator_back',
452 453
  'report_generator_dispatcher' => 'report_generator_dispatcher',
locale/de/todo
476 476
  'redo_stock_info'             => 'redo_stock_info',
477 477
  'reformat_numbers'            => 'reformat_numbers',
478 478
  'relink_accounts'             => 'relink_accounts',
479
  'remove_emptied_rows'         => 'remove_emptied_rows',
479 480
  'report'                      => 'report',
480 481
  'report_for_todo_list'        => 'report_for_todo_list',
481 482
  'report_generator_back'       => 'report_generator_back',
templates/webpages/ct/form_header_de.html
1
[% USE HTML %][% USE LxERP %]<body onLoad="fokus()">
1
[% USE HTML %][% USE LxERP %]
2
<body onLoad="fokus()">
2 3

  
3 4
 <div class="listtop">[% title %]</div>
4 5

  
......
21 22

  
22 23
    <table width="100%">
23 24
     <tr height="5"></tr>
25
     [% IF conf_vertreter %]
26
      <tr>
27
       <th align="right">[% IF is_customer %]Kundentyp[%- ELSE %]Lieferantentyp[%- END %]</th>
28
       <td>
29
        [%- INCLUDE generic/multibox.html
30
              name       = 'business',
31
              DATA       = all_business,
32
              show_empty = 1,
33
              id_key     = 'id',
34
              label_key  = 'description',
35
        -%]
36
       </td>
37
      </tr>
38
      <tr>
39
       <th align="right">Vertreter</th>
40
       <td>
41
        [%- INCLUDE generic/multibox.html
42
              name       = 'salesman_id',
43
              DATA       = ALL_SALESMAN_BUSINESSES,
44
              show_empty = 1,
45
              id_key     = 'id',
46
              label_key  = 'description',
47
        -%]
48
       </td>
49
      </tr>
50
     [%- END %]
24 51
     <tr>
25 52
      [%- IF is_customer %]
26 53
      <th align="right" nowrap>Kundennummer</th>
......
153 180
      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
154 181
     </tr>
155 182

  
183
     [%- IF conf_vertreter %]
184
      <tr>
185
	     <th align="right">Benutzername</th>
186
	     <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
187
 	     <th align="right">Passwort</th>
188
	     <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
189
      </tr>
190
     [%- END %]
191

  
156 192
     <tr>
157
      <th align="right">Kunden-/Lieferantentyp</th>
158
      <td>
159
       [%- INCLUDE generic/multibox.html
160
             name       = 'business',
161
             DATA       = all_business,
162
             show_empty = 1,
163
             id_key     = 'id',
164
             label_key  = 'description',
165
       -%]
166
      </td>
193
      [% UNLESS conf_vertreter %]
194
       <th align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[%- END %]</th>
195
       <td>
196
        [%- INCLUDE generic/multibox.html
197
              name       = 'business',
198
              DATA       = all_business,
199
              show_empty = 1,
200
              id_key     = 'id',
201
              label_key  = 'description',
202
        -%]
203
       </td>
204
      [%- END %]
167 205
      <th align="right">Sprache</th>
168 206
      <td>
169 207
       [%- INCLUDE generic/multibox.html
......
207 245
             label_key  = 'description',
208 246
       -%]
209 247
      </td>
210
      [%- IF is_customer %]
248
      [%- IF is_customer && !use_vertreter %]
211 249
      <th align="right">Verk?ufer/in</th>
212 250
      <td>
213 251
       [%- INCLUDE generic/multibox.html
templates/webpages/ct/form_header_master.html
1
[% USE HTML %][% USE LxERP %]<body onLoad="fokus()">
1
[% USE HTML %][% USE LxERP %]
2
<body onLoad="fokus()">
2 3

  
3 4
 <div class="listtop">[% title %]</div>
4 5

  
......
21 22

  
22 23
    <table width="100%">
23 24
     <tr height="5"></tr>
25
     [% IF conf_vertreter %]
26
      <tr>
27
       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[%- ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
28
       <td>
29
        [%- INCLUDE generic/multibox.html
30
              name       = 'business',
31
              DATA       = all_business,
32
              show_empty = 1,
33
              id_key     = 'id',
34
              label_key  = 'description',
35
        -%]
36
       </td>
37
      </tr>
38
      <tr>
39
       <th align="right"><translate>Representative</translate></th>
40
       <td>
41
        [%- INCLUDE generic/multibox.html
42
              name       = 'salesman_id',
43
              DATA       = ALL_SALESMAN_BUSINESSES,
44
              show_empty = 1,
45
              id_key     = 'id',
46
              label_key  = 'description',
47
        -%]
48
       </td>
49
      </tr>
50
     [%- END %]
24 51
     <tr>
25 52
      [%- IF is_customer %]
26 53
      <th align="right" nowrap><translate>Customer Number</translate></th>
......
153 180
      <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
154 181
     </tr>
155 182

  
183
     [%- IF conf_vertreter %]
184
      <tr>
185
	     <th align="right"><translate>Username</translate></th>
186
	     <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
187
 	     <th align="right"><translate>Password</translate></th>
188
	     <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
189
      </tr>
190
     [%- END %]
191

  
156 192
     <tr>
157
      <th align="right"><translate>Type of Business</translate></th>
158
      <td>
159
       [%- INCLUDE generic/multibox.html
160
             name       = 'business',
161
             DATA       = all_business,
162
             show_empty = 1,
163
             id_key     = 'id',
164
             label_key  = 'description',
165
       -%]
166
      </td>
193
      [% UNLESS conf_vertreter %]
194
       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[% ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
195
       <td>
196
        [%- INCLUDE generic/multibox.html
197
              name       = 'business',
198
              DATA       = all_business,
199
              show_empty = 1,
200
              id_key     = 'id',
201
              label_key  = 'description',
202
        -%]
203
       </td>
204
      [%- END %]
167 205
      <th align="right"><translate>Language</translate></th>
168 206
      <td>
169 207
       [%- INCLUDE generic/multibox.html
......
207 245
             label_key  = 'description',
208 246
       -%]
209 247
      </td>
210
      [%- IF is_customer %]
248
      [%- IF is_customer && !use_vertreter %]
211 249
      <th align="right"><translate>Salesman</translate></th>
212 250
      <td>
213 251
       [%- INCLUDE generic/multibox.html

Auch abrufbar als: Unified diff