Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision bfeee737

Von Cem Aydin vor etwa 2 Jahren hinzugefügt

  • ID bfeee737803c0bd5ac08094c023f9b59c46edca7
  • Vorgänger 0090074a
  • Nachfolger d21df2ea

Swiss QR-Bill: Unstrukturierte Mitteilung in Rechnung hinzufügen

Unterschiede anzeigen:

SL/IS.pm
1516 1516
                globalproject_id               = ?, delivery_customer_id             = ?,
1517 1517
                transaction_description        = ?, delivery_vendor_id               = ?,
1518 1518
                donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?, qrbill_without_amount = ?,
1519
                qr_reference = ?, delivery_term_id = ?
1519
                qr_reference = ?, qr_unstructured_message = ?, delivery_term_id = ?
1520 1520
              WHERE id = ?|;
1521 1521
  @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
1522 1522
             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}), conv_date($form->{tax_point}), conv_i($form->{"customer_id"}),
......
1530 1530
                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}),
1531 1531
                       $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
1532 1532
                       $form->{"donumber"}, $form->{"invnumber_for_credit_note"},        $form->{direct_debit} ? 't' : 'f', $form->{qrbill_without_amount} ? 't' : 'f',
1533
                $qr_reference, conv_i($form->{delivery_term_id}),
1533
                $qr_reference, $form->{"qr_unstructured_message"}, conv_i($form->{delivery_term_id}),
1534 1534
                conv_i($form->{"id"}));
1535 1535
  do_query($form, $dbh, $query, @values);
1536 1536

  
......
2283 2283
           a.mtime, a.itime,
2284 2284
           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
2285 2285
           a.transaction_description, a.donumber, a.invnumber_for_credit_note,
2286
           a.marge_total, a.marge_percent, a.direct_debit, a.qrbill_without_amount, a.qr_reference, a.delivery_term_id,
2286
           a.marge_total, a.marge_percent, a.direct_debit, a.qrbill_without_amount, a.qr_reference, a.qr_unstructured_message, a.delivery_term_id,
2287 2287
           dc.dunning_description,
2288 2288
           e.name AS employee
2289 2289
         FROM ar a
SL/Template/OpenDocument.pm
555 555
    $::form->error($::locale->text('Error getting QR-Bill type.'));
556 556
  }
557 557

  
558
  my %additional_information = (
559
    'unstructured_message' => $form->{'qr_unstructured_message'}
560
  );
561

  
558 562
  # set into form for template processing
559 563
  $form->{'biller_information'} = \%biller_information;
560 564
  $form->{'biller_data'} = \%biller_data;
561 565
  $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'});
562 566
  $form->{'amount_formatted'} = $amount_formatted;
567
  $form->{'unstructured_message'} = $form->{'qr_unstructured_message'};
563 568
  
564 569
  # set outfile
565 570
  my $outfile = $form->{"tmpdir"} . '/' . 'qr-code.png';
......
572 577
     \%payment_information,
573 578
     \%invoice_recipient_data,
574 579
     \%ref_nr_data,
580
     \%additional_information
575 581
   );
576 582
   $qr_image->generate($outfile);
577 583
  } or do {
locale/de/all
2786 2786
  'Purpose'                     => 'Verwendungszweck',
2787 2787
  'Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")' => 'Verwendungszweck (wenn die Spalten purpose, purpose1, purpose2 ... existieren werden diese zum Feld "purpose" zusammengefügt)',
2788 2788
  'Purpose/Reference'           => 'Verwendungszweck und Referenz',
2789
  'QR bill unstructured message' => 'QR-Rechnung unstrukturierte Mitteilung',
2789 2790
  'QR bill without amount'      => 'QR-Rechnung ohne Betrag',
2790 2791
  'QR reference'                => 'QR-Referenz',
2791 2792
  'QR-Code placeholder image: QRCodePlaceholder not found in template.' => 'QR-Code Platzhalter Bild: QRCodePlaceholder nicht in Druckvorlage gefunden.',
locale/en/all
2785 2785
  'Purpose'                     => '',
2786 2786
  'Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")' => '',
2787 2787
  'Purpose/Reference'           => '',
2788
  'QR bill unstructured message' => '',
2788 2789
  'QR bill without amount'      => '',
2789 2790
  'QR reference'                => '',
2790 2791
  'QR-Code placeholder image: QRCodePlaceholder not found in template.' => '',
templates/webpages/is/form_footer.html
47 47
                 [%- L.checkbox_tag('qrbill_without_amount', 'checked', qrbill_without_amount) %]
48 48
               </td>
49 49
             </tr>
50
             <tr>
51
              <th align="right">[% 'QR bill unstructured message' | $T8 %]</th>
52
              <td>
53
                [%- L.input_tag('qr_unstructured_message', qr_unstructured_message) %]
54
              </td>
55
            </tr>
50 56
[%- END %]
51 57
           </table>
52 58
         </td>

Auch abrufbar als: Unified diff