Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8e927544

Von Moritz Bunkus vor fast 2 Jahren hinzugefügt

  • ID 8e927544e3ad08d9ca54fc57381eec506b4828a6
  • Vorgänger 72b54587
  • Nachfolger 480f1f35

Wiederkehrende Abrechnung Positionen: Bearbeiten in Auftragscontrollern

Unterschiede anzeigen:

bin/mozilla/io.pl
171 171
    bin stock_in_out
172 172
  );
173 173
  my @row2_sort   = qw(
174
    serialnr projectnr reqdate subtotal marge listprice lastcost onhand
174
    serialnr projectnr reqdate subtotal recurring_billing_mode marge listprice lastcost onhand
175 175
  );
176 176
  # serialnr is important for delivery_orders
177 177
  if ($form->{type} eq 'sales_delivery_order') {
......
201 201
    stock_in_out  => { width => 10,    value => $stock_in_out_title,                   display => $is_delivery_order, },
202 202
    reqdate       => {                 value => $locale->text('Reqdate'),              display => $is_s_p_order || $is_delivery_order || $is_invoice, },
203 203
    subtotal      => {                 value => $locale->text('Subtotal'),             display => 1, },
204
    recurring_billing_mode => {        value => $locale->text('Recurring billing'),    display => $form->{type} eq 'sales_order', },
204 205
    marge         => {                 value => $locale->text('Ertrag'),               display => $show_marge, },
205 206
    listprice     => {                 value => $locale->text('LP'),                   display => $show_marge, },
206 207
    lastcost      => {                 value => $locale->text('EK'),                   display => $show_marge, },
......
406 407
    ));
407 408
    $column_data{reqdate}   = qq|<input name="reqdate_$i" size="11" data-validate="date" value="$form->{"reqdate_$i"}">|;
408 409
    $column_data{subtotal}  = sprintf qq|<input type="checkbox" name="subtotal_$i" value="1" %s>|, $form->{"subtotal_$i"} ? 'checked' : '';
410
    $column_data{recurring_billing_mode} = SL::Presenter::Tag::select_tag(
411
      "recurring_billing_mode_$i",
412
      [[ 'always', $::locale->text('always') ], [ 'once',   $::locale->text('once')   ], [ 'never',  $::locale->text('never')  ]],
413
      default => $::form->{"recurring_billing_mode_$i"} || 'always',
414
    );
409 415

  
410
# begin marge calculations
416
    # begin marge calculations
411 417
    $form->{"lastcost_$i"}     *= 1;
412 418
    $form->{"marge_percent_$i"} = 0;
413 419

  
......
834 840
                active_price_source active_discount_source delivery_order_items_id
835 841
                invoice_id converted_from_orderitems_id
836 842
                converted_from_delivery_order_items_id converted_from_invoice_id
837
                converted_from_reclamation_items_id);
843
                converted_from_reclamation_items_id recurring_billing_mode);
838 844

  
839 845
  my $ic_cvar_configs = CVar->get_configs(module => 'IC');
840 846
  push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };

Auch abrufbar als: Unified diff