Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f612f63e

Von Moritz Bunkus vor etwa 12 Jahren hinzugefügt

  • ID f612f63eaec658123e4752850c31b33e1865a2e5
  • Vorgänger 347fcb5f
  • Nachfolger e958a6f7

Debitoren-, Kreditorenbuchungen: K/L-Bemerkungen als Extra-Feld anzeigen, nicht in normale Bemerkungen kopieren

Fixt #1858.

Unterschiede anzeigen:

bin/mozilla/ap.pl
153 153
  # build the popup menus
154 154
  $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
155 155

  
156
  # notes
157
  $form->{notes} = $form->{intnotes} unless $form->{notes};
158

  
159 156
  # currencies
160 157
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
161 158

  
......
287 284
  }
288 285
  my $notes =
289 286
    qq|<textarea name=notes rows=$rows cols=50 wrap=soft $readonly>$form->{notes}</textarea>|;
287
  my $intnotes = qq|<textarea name=intnotes rows=$rows cols=50 wrap=soft readonly>$form->{intnotes}</textarea>|;
290 288

  
291 289
  my $department;
292 290
  $department = qq|
......
627 625
        <tr>
628 626
          <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
629 627
          <td align=left>$notes</td>
628

  
629
          <th align=left width=1%>| . $locale->text('Notes for vendor') . qq|</th>
630
          <td align=left>$intnotes</td>
630 631
        </tr>
631 632
      </table>
632 633
    </td>
......
929 930
  $form->{exchangerate} = $form->{forex} if $form->{forex};
930 931

  
931 932
  $form->{invdate} = $form->{transdate};
932
  my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1);
933
  my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1 notes);
933 934

  
934 935
  my $vendor_changed = &check_name("vendor");
935 936

  
......
966 967
  $form->{oldinvtotal}  = $form->{invtotal};
967 968
  $form->{oldtotalpaid} = $totalpaid;
968 969

  
969
  # notes
970
  $form->{notes} = $form->{intnotes} if $vendor_changed;
971

  
972 970
  &display_form;
973 971

  
974 972
  $main::lxdebug->leave_sub();
bin/mozilla/ar.pl
161 161
  $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
162 162
  $form->{rowcount}    = 1;
163 163

  
164
  # notes
165
  $form->{notes} = $form->{intnotes} unless $form->{notes};
166

  
167 164
  # currencies
168 165
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
169 166

  
......
617 614

  
618 615
  $form->{invdate} = $form->{transdate};
619 616

  
620
  my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id);
617
  my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id notes);
621 618

  
622 619
  &check_name("customer");
623 620

  
624
  # check_name loads customer notes into notes, but ar only knows intnotes, so copy them
625
  $form->{notes} = $form->{intnotes} if $saved_variables{customer_id} != $form->{customer_id};
626

  
627 621
  $form->{AR} = $saved_variables{AR};
628 622
  if ($saved_variables{AR_amount_1} =~ m/.--./) {
629 623
    map { $form->{$_} = $saved_variables{$_} } qw(AR_amount_1 taxchart_1);
locale/de/all
1285 1285
  'Notes'                       => 'Bemerkungen',
1286 1286
  'Notes (translation for #1)'  => 'Bemerkungen (Übersetzung für #1)',
1287 1287
  'Notes (will appear on hard copy)' => 'Bemerkungen',
1288
  'Notes for customer'          => 'Bemerkungen beim Kunden',
1289
  'Notes for vendor'            => 'Bemerkungen beim Lieferanten',
1288 1290
  'Nothing has been selected for removal.' => 'Es wurde nichts f&uuml;r eine Entnahme ausgew&auml;hlt.',
1289 1291
  'Nothing has been selected for transfer.' => 'Es wurde nichts zum Umlagern ausgew&auml;hlt.',
1290 1292
  'Nothing selected!'           => 'Es wurde nichts ausgewählt!',
templates/webpages/ar/form_header.html
171 171
        <tr>
172 172
          <th align=left width=1%>[% 'Notes' | $T8 %]</th>
173 173
          <td align=left><textarea name=notes rows="[% rows %]" cols=50 wrap=soft>[% notes | html %]</textarea></td>
174

  
175
          <th align=left width=1%>[% 'Notes for customer' | $T8 %]</th>
176
          <td align=left><textarea name=intnotes rows="[% rows %]" cols=50 wrap=soft readonly>[% intnotes | html %]</textarea></td>
174 177
        </tr>
175 178
      </table>
176 179
    </td>

Auch abrufbar als: Unified diff