Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 94976940

Von Cem Aydin vor fast 3 Jahren hinzugefügt

  • ID 94976940f8eba1a83eef65bfd4ae09e65eea9030
  • Vorgänger 5ae5002c
  • Nachfolger 62b01d9c

Swiss QR-Bill: Option Rechnung ohne Betrag

- Checkbox bei Rechnung hinzugefügt (eingeblendet wenn Feature aktiv,
sonst hidden)
- Integration in Odt Print Ablauf
- Übersetzung + locales lauf

Unterschiede anzeigen:

SL/IS.pm
1481 1481 
                cp_id       = ?, marge_total   = ?, marge_percent = ?,
1482 1482 
                globalproject_id               = ?, delivery_customer_id             = ?,
1483 1483 
                transaction_description        = ?, delivery_vendor_id               = ?,
1484 
                donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?,
1484 
                donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?, qrbill_without_amount = ?,
1485 1485 
                delivery_term_id = ?
1486 1486 
              WHERE id = ?|;
1487 1487 
  @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
......
1495 1495 
                conv_i($form->{"cp_id"}),            1 * $form->{marge_total} ,      1 * $form->{marge_percent},
1496 1496 
                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}),
1497 1497 
                       $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
1498 
                       $form->{"donumber"}, $form->{"invnumber_for_credit_note"},        $form->{direct_debit} ? 't' : 'f',
1498 
                       $form->{"donumber"}, $form->{"invnumber_for_credit_note"},        $form->{direct_debit} ? 't' : 'f', $form->{qrbill_without_amount} ? 't' : 'f',
1499 1499 
                conv_i($form->{delivery_term_id}),
1500 1500 
                conv_i($form->{"id"}));
1501 1501 
  do_query($form, $dbh, $query, @values);
......
2249 2249 
           a.mtime, a.itime,
2250 2250 
           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
2251 2251 
           a.transaction_description, a.donumber, a.invnumber_for_credit_note,
2252 
           a.marge_total, a.marge_percent, a.direct_debit, a.delivery_term_id,
2252 
           a.marge_total, a.marge_percent, a.direct_debit, a.qrbill_without_amount, a.delivery_term_id,
2253 2253 
           dc.dunning_description,
2254 2254 
           e.name AS employee
2255 2255 
         FROM ar a
SL/Template/OpenDocument.pm
653 653 
    'countrycode' => $biller_countrycode,
654 654 
  );
655 655 

  		




  
  656
  
    
  my $amount;


  		




  
  657
  
    
  if ($form->{'qrbill_without_amount'}) {


  		




  
  658
  
    
    $amount = '';


  		




  
  659
  
    
  } else {


  		




  
  660
  
    
    $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'}));


  		




  
  661
  
    
  }


  		




  
  662
  
    

  		




  656
  663
  
    
  my %payment_information = (


  		




  657
  
  
    
    'amount' => sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'})),


  		




  
  664
  
    
    'amount' => $amount,


  		




  658
  665
  
    
    'currency' => $form->{'currency'},


  		




  659
  666
  
    
  );


  		




  660
  667
  
    

  		












  

    
      locale/de/all
    
  





  2753
  2753
  
    
  'Purpose'                     => 'Verwendungszweck',


  		




  2754
  2754
  
    
  '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)',


  		




  2755
  2755
  
    
  'Purpose/Reference'           => 'Verwendungszweck und Referenz',


  		




  
  2756
  
    
  'QR bill without amount'      => 'QR-Rechnung ohne Betrag',


  		




  2756
  2757
  
    
  'QR-Code placeholder image: QRCodePlaceholder not found in template.' => 'QR-Code Platzhalter Bild: QRCodePlaceholder nicht gefunden.',


  		




  2757
  2758
  
    
  'QR-Image generation failed: ' => 'QR-Code Erzeugung fehlgeschlagen: ',


  		




  2758
  2759
  
    
  'QUEUED'                      => 'In Warteschlange',


  		












  

    
      templates/webpages/is/form_footer.html
    
  





  40
  40
  
    
                 [%- L.checkbox_tag('direct_debit', 'checked', direct_debit) %]


  		




  41
  41
  
    
               </td>


  		




  42
  42
  
    
             </tr>


  		




  
  43
  
    
[%- IF INSTANCE_CONF.get_create_qrbill_invoices > 0 %]


  		




  
  44
  
    
             <tr>


  		




  
  45
  
    
               <th align="right">[% 'QR bill without amount' | $T8 %]</th>


  		




  
  46
  
    
               <td>


  		




  
  47
  
    
                 [%- L.checkbox_tag('qrbill_without_amount', 'checked', qrbill_without_amount) %]


  		




  
  48
  
    
               </td>


  		




  
  49
  
    
             </tr>


  		




  
  50
  
    
[%- END %]


  		




  43
  51
  
    
           </table>


  		




  44
  52
  
    
         </td>


  		




  45
  53
  
    
        </tr>


  		




  ......




  152
  160
  
    
<input type="hidden" name="customer_discount" value="[% customer_discount %]">


  		




  153
  161
  
    
<input type="hidden" name="gldate" value="[% gldate %]">


  		




  154
  162
  
    

  		




  
  163
  
    
[%- IF INSTANCE_CONF.get_create_qrbill_invoices <= 0 %]


  		




  
  164
  
    
 <input type="hidden" name="qrbill_without_amount" value="[% qrbill_without_amount %]">


  		




  
  165
  
    
[%- END %]


  		




  
  166
  
    

  		




  155
  167
  
    
<div id="shipto_inputs" class="hidden">


  		




  156
  168
  
    
 [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]


  		




  157
  169
  
    
</div>


  		












Auch abrufbar als:  Unified diff