Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1bfdd83b

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 1bfdd83b1ba9b0dca96105be0a32ff3ea9794584
  • Vorgänger 3c1ceacd
  • Nachfolger 7d0e997b

------------------------------------------------------------------------
r7136 | mbunkus | 2008-06-20 11:16:19 +0200 (Fri, 20 Jun 2008) | 1 line

Lieferscheine: Ein Button eingefügt, mit dem man Lieferscheine als geschlossen markieren kann, ohne sie in Rechnungen umwandeln zu müssen.
------------------------------------------------------------------------

Unterschiede anzeigen:

bin/mozilla/do.pl
1216 1216
  $lxdebug->leave_sub();
1217 1217
}
1218 1218

  
1219
sub mark_closed {
1220
  $lxdebug->enter_sub();
1221

  
1222
  DO->close_orders('ids' => [ $form->{id} ]);
1223

  
1224
  $form->{closed} = 1;
1225

  
1226
  update();
1227

  
1228
  $lxdebug->leave_sub();
1229
}
1230

  
1231

  
1219 1232
sub yes {
1220 1233
  call_sub($form->{yes_nextsub});
1221 1234
}
locale/de/all
857 857
  'March'                       => 'M?rz',
858 858
  'Margins'                     => 'Seitenränder',
859 859
  'Mark as paid?'               => 'Als bezahlt markieren?',
860
  'Mark closed'                 => 'Schlie?en',
860 861
  'Marked as paid'              => 'Als bezahlt markiert',
861 862
  'Marked entries printed!'     => 'Markierte Eintr?ge wurden gedruckt!',
862 863
  'Master Data'                 => 'Stammdaten',
locale/de/do
337 337
  'invoicetotal'                => 'invoicetotal',
338 338
  'item_selected'               => 'item_selected',
339 339
  'mark_as_paid_common'         => 'mark_as_paid_common',
340
  'mark_closed'                 => 'mark_closed',
340 341
  'name_selected'               => 'name_selected',
341 342
  'new_item'                    => 'new_item',
342 343
  'new_license'                 => 'new_license',
......
396 397
  'l?schen'                     => 'delete',
397 398
  'email'                       => 'e_mail',
398 399
  'rechnung'                    => 'invoice',
400
  'schlie?en'                   => 'mark_closed',
399 401
  'neue_ware'                   => 'new_part',
400 402
  'nein'                        => 'no',
401 403
  'drucken'                     => 'print',
locale/de/login
441 441
  'login_screen'                => 'login_screen',
442 442
  'logout'                      => 'logout',
443 443
  'mark_as_paid_common'         => 'mark_as_paid_common',
444
  'mark_closed'                 => 'mark_closed',
444 445
  'name_selected'               => 'name_selected',
445 446
  'new_item'                    => 'new_item',
446 447
  'new_license'                 => 'new_license',
......
517 518
  'abschließen'           => 'finish',
518 519
  'rechnung'                    => 'invoice',
519 520
  'anmeldung'                   => 'login',
521
  'schlie?en'                   => 'mark_closed',
520 522
  'neue_ware'                   => 'new_part',
521 523
  'nein'                        => 'no',
522 524
  'auftrag'                     => 'order',
locale/de/oe
399 399
  'invoicetotal'                => 'invoicetotal',
400 400
  'item_selected'               => 'item_selected',
401 401
  'mark_as_paid_common'         => 'mark_as_paid_common',
402
  'mark_closed'                 => 'mark_closed',
402 403
  'name_selected'               => 'name_selected',
403 404
  'new_item'                    => 'new_item',
404 405
  'new_license'                 => 'new_license',
......
465 466
  'lieferschein'                => 'delivery_order',
466 467
  'email'                       => 'e_mail',
467 468
  'rechnung'                    => 'invoice',
469
  'schlie?en'                   => 'mark_closed',
468 470
  'neue_ware'                   => 'new_part',
469 471
  'nein'                        => 'no',
470 472
  'auftrag'                     => 'order',
locale/de/todo
430 430
  'invoicetotal'                => 'invoicetotal',
431 431
  'item_selected'               => 'item_selected',
432 432
  'mark_as_paid_common'         => 'mark_as_paid_common',
433
  'mark_closed'                 => 'mark_closed',
433 434
  'name_selected'               => 'name_selected',
434 435
  'new_item'                    => 'new_item',
435 436
  'new_license'                 => 'new_license',
......
504 505
  'email'                       => 'e_mail',
505 506
  'abschließen'           => 'finish',
506 507
  'rechnung'                    => 'invoice',
508
  'schlie?en'                   => 'mark_closed',
507 509
  'neue_ware'                   => 'new_part',
508 510
  'nein'                        => 'no',
509 511
  'auftrag'                     => 'order',
templates/webpages/do/form_footer_de.html
72 72
   [%- END %]
73 73
   [%- END %]
74 74
   [%- IF id %]
75
   [%- UNLESS closed %]
76
   <input class="submit" type="submit" name="action" value="Schlie?en">
77
   [%- END %]
75 78
   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
76 79
   [%- END %]
77 80
  </p>
templates/webpages/do/form_footer_master.html
72 72
   [%- END %]
73 73
   [%- END %]
74 74
   [%- IF id %]
75
   [%- UNLESS closed %]
76
   <input class="submit" type="submit" name="action" value="<translate>Mark closed</translate>">
77
   [%- END %]
75 78
   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
76 79
   [%- END %]
77 80
  </p>

Auch abrufbar als: Unified diff