Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 25a5cdc8

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID 25a5cdc82f6ca252d7030df5bf8e9343e9b53fb4
  • Vorgänger b75d9456
  • Nachfolger 2fe806fb

Funktion "Als Entwurf speichern" für Dialogbuchungen implementiert.

Teil eines Fixes für Bug 612.

Unterschiede anzeigen:

bin/mozilla/gl.pl
41 41
use SL::ReportGenerator;
42 42

  
43 43
require "bin/mozilla/common.pl";
44
require "bin/mozilla/drafts.pl";
44 45
require "bin/mozilla/reportgenerator.pl";
45 46

  
46 47
1;
......
80 81

  
81 82
  $auth->assert('general_ledger');
82 83

  
84
  return $lxdebug->leave_sub() if (load_draft_maybe());
85

  
83 86
  $form->{title} = "Add";
84 87

  
85 88
  $form->{callback} = "gl.pl?action=add" unless $form->{callback};
......
1292 1295
      . qq|"> |;
1293 1296

  
1294 1297
  } else {
1298
    if ($form->{draft_id}) {
1299
      my $remove_draft_checked = 'checked' if ($form->{remove_draft});
1300
      print qq|<p>\n|
1301
        . qq|  <input name="remove_draft" id="remove_draft" type="checkbox" class="checkbox" ${remove_draft_checked}>|
1302
        . qq|  <label for="remove_draft">| . $locale->text('Remove Draft') . qq|</label>\n|
1303
        . qq|</p>\n|;
1304
    }
1305

  
1295 1306
    print qq|
1296 1307
        <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
1297
        <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">|;
1308
        <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|"> |
1309
        . NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'))
1310
        . $cgi->hidden('-name' => 'draft_id',          '-default' => [$form->{draft_id}])
1311
        . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]);
1298 1312
  }
1299 1313

  
1300 1314
  print "
......
1519 1533

  
1520 1534
  post_transaction();
1521 1535

  
1536
  remove_draft() if $form->{remove_draft};
1537

  
1522 1538
  $form->{callback} = build_std_url("action=add", "show_details");
1523 1539
  $form->redirect($form->{callback});
1524 1540

  
locale/de/gl
95 95
  'Dec'                         => 'Dez',
96 96
  'December'                    => 'Dezember',
97 97
  'Delete'                      => 'L?schen',
98
  'Delete drafts'               => 'Entw?rfe l?schen',
98 99
  'Delivery Order'              => 'Lieferschein',
99 100
  'Department'                  => 'Abteilung',
100 101
  'Dependency loop detected:'   => 'Schleife in den Abh&auml;ngigkeiten entdeckt:',
101 102
  'Description'                 => 'Beschreibung',
102 103
  'Description missing!'        => 'Beschreibung fehlt.',
103 104
  'Directory'                   => 'Verzeichnis',
105
  'Draft saved.'                => 'Entwurf gespeichert.',
104 106
  'Dunning'                     => 'Mahnung',
105 107
  'ELSE'                        => 'Zusatz',
106 108
  'Edit General Ledger Transaction' => 'Buchung im Hauptbuch bearbeiten',
......
189 191
  'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich',
190 192
  'Reference'                   => 'Referenz',
191 193
  'Reference missing!'          => 'Referenz fehlt!',
194
  'Remove Draft'                => 'Entwurf l&ouml;schen',
192 195
  'Reports'                     => 'Berichte',
193 196
  'Request quotation'           => 'Preisanfrage',
194 197
  'Revenue'                     => 'Erl?skonto',
......
198 201
  'Sales Invoice'               => 'Rechnung',
199 202
  'Sales Order'                 => 'Kundenauftrag',
200 203
  'Sales quotation'             => 'Angebot',
204
  'Save draft'                  => 'Entwurf speichern',
201 205
  'Select a Customer'           => 'Endkunde ausw?hlen',
202 206
  'Select a customer'           => 'Einen Kunden ausw&auml;hlen',
203 207
  'Select a part'               => 'Artikel ausw&auml;hlen',
......
205 209
  'Sep'                         => 'Sep',
206 210
  'September'                   => 'September',
207 211
  'Show details'                => 'Details anzeigen',
212
  'Skip'                        => '?berspringen',
208 213
  'Source'                      => 'Beleg',
209 214
  'Storno'                      => 'Storno',
210 215
  'Storno Invoice'              => 'Stornorechnung',
......
285 290
  'cov_selection_internal'      => 'cov_selection_internal',
286 291
  'create_subtotal_row'         => 'create_subtotal_row',
287 292
  'delete'                      => 'delete',
293
  'delete_drafts'               => 'delete_drafts',
288 294
  'delivery_customer_selection' => 'delivery_customer_selection',
289 295
  'display_form'                => 'display_form',
290 296
  'display_rows'                => 'display_rows',
297
  'dont_load_draft'             => 'dont_load_draft',
298
  'draft_action_dispatcher'     => 'draft_action_dispatcher',
291 299
  'edit'                        => 'edit',
292 300
  'form_footer'                 => 'form_footer',
293 301
  'form_header'                 => 'form_header',
294 302
  'format_dates'                => 'format_dates',
295 303
  'generate_report'             => 'generate_report',
296 304
  'gl_transaction'              => 'gl_transaction',
305
  'load_draft'                  => 'load_draft',
306
  'load_draft_maybe'            => 'load_draft_maybe',
297 307
  'mark_as_paid_common'         => 'mark_as_paid_common',
298 308
  'part_selection_internal'     => 'part_selection_internal',
299 309
  'post'                        => 'post',
......
301 311
  'post_transaction'            => 'post_transaction',
302 312
  'prepare_transaction'         => 'prepare_transaction',
303 313
  'reformat_numbers'            => 'reformat_numbers',
314
  'remove_draft'                => 'remove_draft',
304 315
  'report_generator_back'       => 'report_generator_back',
305 316
  'report_generator_dispatcher' => 'report_generator_dispatcher',
306 317
  'report_generator_do'         => 'report_generator_do',
......
309 320
  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
310 321
  'retrieve_partunits'          => 'retrieve_partunits',
311 322
  'sales_invoice'               => 'sales_invoice',
323
  'save_draft'                  => 'save_draft',
312 324
  'search'                      => 'search',
313 325
  'select_part'                 => 'select_part',
314 326
  'select_part_internal'        => 'select_part_internal',
......
324 336
  'debitorenbuchung'            => 'ar_transaction',
325 337
  'weiter'                      => 'continue',
326 338
  'l?schen'                     => 'delete',
339
  'entw?rfe_l?schen'            => 'delete_drafts',
327 340
  'dialogbuchung'               => 'gl_transaction',
328 341
  'neue_ware'                   => 'new_part',
329 342
  'buchen'                      => 'post',
330 343
  'rechnung'                    => 'sales_invoice',
344
  'entwurf_speichern'           => 'save_draft',
345
  '?berspringen'                => 'skip',
331 346
  'storno'                      => 'storno',
332 347
  'erneuern'                    => 'update',
333 348
  'einkaufsrechnung'            => 'vendor_invoice',

Auch abrufbar als: Unified diff