Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 875f08f3

Von Sven Schöling vor mehr als 15 Jahren hinzugefügt

  • ID 875f08f3a3e043b19a874e3fa3530d777017a754
  • Vorgänger 3b3ef5ba
  • Nachfolger 96d60de4

Lieferantenanezige in Einkaufsrechnungenbericht

Unterschiede anzeigen:

SL/AP.pm
397 397
    qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
398 398
    qq|  a.globalproject_id, a.storno, a.storno_id, | .
399 399
    qq|  pr.projectnumber AS globalprojectnumber, | .
400
    qq|  e.name AS employee | .
400
    qq|  e.name AS employee, | .
401
    qq|  v.vendornumber, v.country, v.ustid, | .
402
    qq|  tz.description AS taxzone, | .
403
    qq|  pt.description AS payment_terms | .
401 404
    qq|FROM ap a | .
402 405
    qq|JOIN vendor v ON (a.vendor_id = v.id) | .
403 406
    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
404
    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
407
    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) | .
408
    qq|LEFT JOIN tax_zones tz ON (tz.id = v.taxzone_id)| .
409
    qq|LEFT JOIN payment_terms pt ON (pt.id = v.payment_id)|;
405 410

  
406 411
  my $where = '';
407 412
  my @values;
......
761 766

  
762 767
  # now copy acc_trans entries
763 768
  $query = qq|SELECT a.*, c.link FROM acc_trans a LEFT JOIN chart c ON a.chart_id = c.id WHERE a.trans_id = ? ORDER BY a.acc_trans_id|;
764
  my $rowref = selectall_hashref_query($form, $dbh, $query, $id); 
769
  my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
765 770

  
766 771
  # kill all entries containing payments, which are the last 2n rows, of which the last has link =~ /paid/
767 772
  while ($rowref->[-1]{link} =~ /paid/) {
bin/mozilla/ap.pl
1326 1326
		<td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
1327 1327
		<td nowrap>| . $locale->text('Project Number') . qq|</td>
1328 1328
	      </tr>
1329
          <tr>
1330
        <td colspan=4 align=left><b>| . $locale->text('Vendor') . qq| </td>
1331
          </tr>
1332
          <tr>
1333
		<td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
1334
		<td nowrap>| . $locale->text('Vendor Number') . qq|</td>
1335
		<td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
1336
		<td nowrap>| . $locale->text('Country') . qq|</td>
1337
		<td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
1338
		<td nowrap>| . $locale->text('USt-IdNr.') . qq|</td>
1339
		<td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
1340
		<td nowrap>| . $locale->text('Steuersatz') . qq|</td>
1341
          </tr>
1342
          <tr>
1343
		<td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
1344
		<td nowrap>| . $locale->text('Payment Terms') . qq|</td>
1345
          </tr>
1329 1346
	    </table>
1330 1347
	  </td>
1331 1348
	</tr>
......
1388 1405

  
1389 1406
  my @columns =
1390 1407
    qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
1391
       due duedate transaction_description notes employee globalprojectnumber);
1408
       due duedate transaction_description notes employee globalprojectnumber
1409
       vendornumber country ustid taxzone payment_terms);
1392 1410

  
1393 1411
  my @hidden_variables = map { "l_${_}" } @columns;
1394 1412
  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
......
1413 1431
    'notes'                   => { 'text' => $locale->text('Notes'), },
1414 1432
    'employee'                => { 'text' => $locale->text('Salesperson'), },
1415 1433
    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
1434
    'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
1435
    'country'                 => { 'text' => $locale->text('Country'), },
1436
    'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
1437
    'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
1438
    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
1416 1439
  );
1417 1440

  
1418 1441
  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
bin/mozilla/ar.pl
1426 1426
		<td nowrap>| . $locale->text('Steuersatz') . qq|</td>
1427 1427
          </tr>
1428 1428
          <tr>
1429
		<td align=right><input name="l_payment" class=checkbox type=checkbox value=Y></td>
1429
		<td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
1430 1430
		<td nowrap>| . $locale->text('Payment Terms') . qq|</td>
1431 1431
          </tr>
1432 1432

  
locale/de/ap
59 59
  'Contact'                     => 'Kontakt',
60 60
  'Continue'                    => 'Weiter',
61 61
  'Could not spawn the printer command.' => 'Die Druckanwendung konnte nicht gestartet werden.',
62
  'Country'                     => 'Land',
62 63
  'Create and edit RFQs'        => 'Lieferantenanfragen erfassen und bearbeiten',
63 64
  'Create and edit customers and vendors' => 'Kunden und Lieferanten erfassen und bearbeiten',
64 65
  'Create and edit dunnings'    => 'Mahnungen erfassen und bearbeiten',
......
179 180
  'Paid'                        => 'bezahlt',
180 181
  'Part Number'                 => 'Artikelnummer',
181 182
  'Part description'            => 'Artikelbeschreibung',
183
  'Payment Terms'               => 'Zahlungskonditionen',
182 184
  'Payment date missing!'       => 'Tag der Zahlung fehlt!',
183 185
  'Payment posted!'             => 'Zahlung gebucht!',
184 186
  'Payments'                    => 'Zahlungsausg?nge',
......
217 219
  'September'                   => 'September',
218 220
  'Skip'                        => '?berspringen',
219 221
  'Source'                      => 'Beleg',
222
  'Steuersatz'                  => 'Steuersatz',
220 223
  'Storno'                      => 'Storno',
221 224
  'Storno (one letter abbreviation)' => 'S',
222 225
  'Storno Invoice'              => 'Stornorechnung',
......
246 249
  'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
247 250
  'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
248 251
  'Type'                        => 'Typ',
252
  'USt-IdNr.'                   => 'USt-IdNr.',
249 253
  'Unit'                        => 'Einheit',
250 254
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
251 255
  'Update'                      => 'Erneuern',
......
254 258
  'Variable'                    => 'Variable',
255 259
  'Vendor'                      => 'Lieferant',
256 260
  'Vendor Invoice'              => 'Einkaufsrechnung',
261
  'Vendor Number'               => 'Lieferantennummer',
257 262
  'Vendor details'              => 'Lieferantendetails',
258 263
  'Vendor missing!'             => 'Lieferant fehlt!',
259 264
  'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',

Auch abrufbar als: Unified diff