Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ea13b69d

Von Jan Büren vor fast 4 Jahren hinzugefügt

  • ID ea13b69d6d3a70c5432ae6b6d29a0a0531e51da9
  • Vorgänger fd3e0f93
  • Nachfolger 524bc23e

Zahlungsbedingungen Kreditorenbeleg Speichern und Laden in Maske

Das was Commit 8b5bed7fe5 versprochen hat, jetzt auch in Echt ;-)

Unterschiede anzeigen:

SL/AP.pm
141 141
                transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
142 142
                amount = ?, duedate = ?, deliverydate = ?, tax_point = ?, paid = ?, netamount = ?,
143 143
                currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
144
                globalproject_id = ?, direct_debit = ?
144
                globalproject_id = ?, direct_debit = ?, payment_id = ?
145 145
               WHERE id = ?|;
146 146
    @values = ($form->{invnumber}, conv_date($form->{transdate}),
147 147
                  $form->{ordnumber}, conv_i($form->{vendor_id}),
......
152 152
                  conv_i($form->{department_id}), $form->{storno},
153 153
                  $form->{storno_id}, conv_i($form->{globalproject_id}),
154 154
                  $form->{direct_debit} ? 't' : 'f',
155
                  $form->{payment_id},
155 156
                  $form->{id});
156 157
    do_query($form, $dbh, $query, @values);
157 158

  
bin/mozilla/ap.pl
564 564
  print $form->parse_html_template('ap/form_header', {
565 565
    today => DateTime->today,
566 566
    currencies => SL::DB::Manager::Currency->get_all_sorted,
567
    payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $::form->{payment_id}*1 ]]),
567
    payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $form->{invoice_obj}->{payment_id}*1 ]]),
568 568
  });
569 569

  
570 570
  $main::lxdebug->leave_sub();
templates/webpages/ap/form_header.html
252 252
            [% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
253 253
           </td>
254 254
           <td>
255
             [% L.select_tag('payment_id', payment_terms, default=payment_id, title_key='description', with_empty=1, style="width: 250px", onchange="kivi.SalesPurchase.set_duedate_on_reference_date_change('invdate')") %]
255
             [% L.select_tag('payment_id', payment_terms, default=invoice_obj.payment_id, title_key='description', with_empty=1, style="width: 250px", onchange="kivi.SalesPurchase.set_duedate_on_reference_date_change('invdate')") %]
256 256
           </td>
257 257
          <tr>
258 258
        </table>

Auch abrufbar als: Unified diff