Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 66e2fdcc

Von Waldemar Toews vor fast 11 Jahren hinzugefügt

  • ID 66e2fdcc4f89a4f13c77f6e44f2969fd46aa7aba
  • Vorgänger 2565f6c2
  • Nachfolger 7a64a31e

Kunden Mandanten ID fuer SEPA Lastschrift implementiert.

Unterschiede anzeigen:

SL/DB/MetaSetup/Customer.pm
39 39 
  klass               => { type => 'integer', default => '0' },
40 40 
  language            => { type => 'varchar', length => 5 },
41 41 
  language_id         => { type => 'integer' },
42 
  mandator_id         => { type => 'text' },
42 43 
  mtime               => { type => 'timestamp' },
43 44 
  name                => { type => 'text', not_null => 1 },
44 45 
  notes               => { type => 'text' },
SL/DB/MetaSetup/Vendor.pm
36 36 
  itime            => { type => 'timestamp', default => 'now()' },
37 37 
  language         => { type => 'varchar', length => 5 },
38 38 
  language_id      => { type => 'integer' },
39 
  mandator_id      => { type => 'text' },
39 40 
  mtime            => { type => 'timestamp' },
40 41 
  name             => { type => 'varchar', length => 75, not_null => 1 },
41 42 
  notes            => { type => 'text' },
SL/SEPA.pm
177 177 
  if ($export->{id}) {
178 178 
    my ($columns, $joins);
179 179 

  		




  
  180
  
    
    my $mandator_id = $params{vc} eq 'customer' ? ', mandator_id' : '';


  		




  
  181
  
    

  		




  180
  182
  
    
    if ($params{details}) {


  		




  181
  
  
    
      $columns = qq|, arap.invnumber, arap.invoice, arap.transdate AS reference_date, vc.name AS vc_name, vc.${vc}number AS vc_number, c.accno AS chart_accno, c.description AS chart_description|;


  		




  
  183
  
    
      $columns = qq|, arap.invnumber, arap.invoice, arap.transdate AS reference_date, vc.name AS vc_name, vc.${vc}number AS vc_number, c.accno AS chart_accno, c.description AS chart_description, ${mandator_id}|;


  		




  182
  184
  
    
      $joins   = qq|LEFT JOIN ${arap} arap ON (sei.${arap}_id = arap.id)


  		




  183
  185
  
    
                    LEFT JOIN ${vc} vc     ON (arap.${vc}_id  = vc.id)


  		




  184
  186
  
    
                    LEFT JOIN chart c      ON (sei.chart_id   = c.id)|;


  		












  

    
      SL/SEPA/XML.pm
    
  





  223
  223
  
    
        $xml->startTag('DrctDbtTx');


  		




  224
  224
  
    

  		




  225
  225
  
    
        $xml->startTag('MndtRltdInf');


  		




  226
  
  
    
        $xml->dataElement('MndtId', $self->_restricted_identification_sepa2($transaction->get('company_number')));


  		




  
  226
  
    
        $xml->dataElement('MndtId', $self->_restricted_identification_sepa2($transaction->get('mandator_id')));


  		




  227
  227
  
    
        $xml->dataElement('DtOfSgntr', $transaction->get('reference_date', 2010-12-02));


  		




  228
  228
  
    
        $xml->endTag('MndtRltdInf');


  		




  229
  229
  
    

  		












  

    
      bin/mozilla/sepa.pl
    
  





  496
  496
  
    

  		




  497
  497
  
    
  foreach my $item (@items) {


  		




  498
  498
  
    
    my $requested_execution_date;


  		




  
  499
  
    
    my $mandator_id;


  		




  499
  500
  
    
    if ($item->{requested_execution_date}) {


  		




  500
  501
  
    
      my ($yy, $mm, $dd)        = $locale->parse_date($myconfig, $item->{requested_execution_date});


  		




  501
  502
  
    
      $requested_execution_date = sprintf '%04d-%02d-%02d', $yy, $mm, $dd;


  		




  ......




  504
  505
  
    
    if ($vc eq 'customer') {


  		




  505
  506
  
    
      my ($yy, $mm, $dd)      = $locale->parse_date($myconfig, $item->{reference_date});


  		




  506
  507
  
    
      $item->{reference_date} = sprintf '%04d-%02d-%02d', $yy, $mm, $dd;


  		




  
  508
  
    
      $mandator_id = $item->{mandator_id};


  		




  507
  509
  
    
    }


  		




  508
  510
  
    

  		




  509
  511
  
    
    $sepa_xml->add_transaction({ 'src_iban'       => $item->{our_iban},


  		




  ......




  514
  516
  
    
                                 'company_number' => $item->{vc_number},


  		




  515
  517
  
    
                                 'amount'         => $item->{amount},


  		




  516
  518
  
    
                                 'reference'      => $item->{reference},


  		




  
  519
  
    
                                 'mandator_id'    => $mandator_id,


  		




  517
  520
  
    
                                 'reference_date' => $item->{reference_date},


  		




  518
  521
  
    
                                 'execution_date' => $requested_execution_date,


  		




  519
  522
  
    
                                 'end_to_end_id'  => $item->{end_to_end_id} });


  		












  

    
      locale/de/all
    
  





  1286
  1286
  
    
  'Make default profile'        => 'Zu Standardprofil machen',


  		




  1287
  1287
  
    
  'Manage Custom Variables'     => 'Benutzerdefinierte Variablen',


  		




  1288
  1288
  
    
  'Mandantennummer'             => 'Mandantennummer',


  		




  
  1289
  
    
  'Mandator ID'                 => 'Mandanten-ID',


  		




  1289
  1290
  
    
  'Mandatory Departments'       => 'Benutzer muss Abteilungen vergeben',


  		




  1290
  1291
  
    
  'Map'                         => 'Karte',


  		




  1291
  1292
  
    
  'Mar'                         => 'März',


  		












  

    
      sql/Pg-upgrade2/add_customer_mandator_id.sql
    
  





  
  1
  
    
-- @tag: add_customer_mandator_id


  		




  
  2
  
    
-- @description: Einführen einer Mandanten ID Spalte bei Kunden und Lieferanten.


  		




  
  3
  
    
-- @depends: release_3_0_0


  		




  
  4
  
    

  		




  
  5
  
    
ALTER TABLE customer ADD mandator_id text;


  		




  
  6
  
    
ALTER TABLE vendor   ADD mandator_id text;


  		












  

    
      templates/webpages/sepa/bank_transfer_create.html
    
  





  47
  47
  
    
     <th class="listheading">[% 'IBAN' | $T8 %]</th>


  		




  48
  48
  
    
     <th class="listheading">[% 'BIC' | $T8 %]</th>


  		




  49
  49
  
    
     <th class="listheading">[% 'Bank' | $T8 %]</th>


  		




  
  50
  
    
     [% IF vc == 'customer' %]


  		




  
  51
  
    
      <th class="listheading">[% 'Mandator ID' | $T8 %]</th>


  		




  
  52
  
    
     [%- END %]


  		




  50
  53
  
    
    </tr>


  		




  51
  54
  
    

  		




  52
  55
  
    
    [%- FOREACH vbi = VC_BANK_INFO %]


  		




  ......




  59
  62
  
    
     <td><input name="vc_bank_info[].iban" size="34" value="[% HTML.escape(vbi.iban.substr(0, 34)) %]" maxlength="34"></td>


  		




  60
  63
  
    
     <td><input name="vc_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic.substr(0, 20)) %]" maxlength="20"></td>


  		




  61
  64
  
    
     <td><input name="vc_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>


  		




  
  65
  
    
     [% IF vc == 'customer' %]


  		




  
  66
  
    
      <td><input name="vc_bank_info[].mandator_id" size="30" value="[% HTML.escape(vbi.mandator_id) %]"></td>


  		




  
  67
  
    
     [%- END %]


  		




  62
  68
  
    
    </tr>


  		




  63
  69
  
    
    [%- END %]


  		




  64
  70
  
    
   </table>


  		












  

    
      templates/webpages/sepa/bank_transfer_edit.html
    
  





  33
  33
  
    
      <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>


  		




  34
  34
  
    
     [%- END %]


  		




  35
  35
  
    
     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>


  		




  
  36
  
    
     [% IF vc == 'customer' %]


  		




  
  37
  
    
      <th class="listheading" align="right">[% 'Mandator ID' | $T8 %]</th>


  		




  
  38
  
    
     [%- END %]


  		




  36
  39
  
    
     <th class="listheading">[% 'Reference' | $T8 %]</th>


  		




  37
  40
  
    
     <th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>


  		




  38
  41
  
    
     <th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>


  		




  ......




  44
  47
  
    
     <th class="listheading">[% 'IBAN' | $T8 %]</th>


  		




  45
  48
  
    
     <th class="listheading">[% 'BIC' | $T8 %]</th>


  		




  46
  49
  
    
     [%- IF show_post_payments_button %]


  		




  47
  
  
    
      <th class="listheading" colspan="3">&nbsp;</th>


  		




  
  50
  
    
      <th class="listheading" colspan="[% IF vc == 'customer' %]4[% ELSE %]3[% END %]">&nbsp;</th>


  		




  48
  51
  
    
      <th class="listheading">


  		




  49
  52
  
    
        [% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]


  		




  50
  53
  
    
      </th>


  		




  ......




  73
  76
  
    
      <td>[% HTML.escape(item.vc_iban) %]</td>


  		




  74
  77
  
    
      <td>[% HTML.escape(item.vc_bic) %]</td>


  		




  75
  78
  
    
      <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>


  		




  
  79
  
    
      [% IF vc == 'customer' %]


  		




  
  80
  
    
       <td>[% HTML.escape(item.mandator_id) %]</td>


  		




  
  81
  
    
      [%- END %]


  		




  76
  82
  
    
      <td>[% HTML.escape(item.reference) %]</td>


  		




  77
  83
  
    
      <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>


  		




  78
  84
  
    
      <td align="right" nowrap>


  		












Auch abrufbar als:  Unified diff