Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 66e2fdcc

Von Waldemar Toews vor mehr als 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
klass => { type => 'integer', default => '0' },
language => { type => 'varchar', length => 5 },
language_id => { type => 'integer' },
mandator_id => { type => 'text' },
mtime => { type => 'timestamp' },
name => { type => 'text', not_null => 1 },
notes => { type => 'text' },
SL/DB/MetaSetup/Vendor.pm
itime => { type => 'timestamp', default => 'now()' },
language => { type => 'varchar', length => 5 },
language_id => { type => 'integer' },
mandator_id => { type => 'text' },
mtime => { type => 'timestamp' },
name => { type => 'varchar', length => 75, not_null => 1 },
notes => { type => 'text' },
SL/SEPA.pm
if ($export->{id}) {
my ($columns, $joins);
my $mandator_id = $params{vc} eq 'customer' ? ', mandator_id' : '';
if ($params{details}) {
$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|;
$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}|;
$joins = qq|LEFT JOIN ${arap} arap ON (sei.${arap}_id = arap.id)
LEFT JOIN ${vc} vc ON (arap.${vc}_id = vc.id)
LEFT JOIN chart c ON (sei.chart_id = c.id)|;
SL/SEPA/XML.pm
$xml->startTag('DrctDbtTx');
$xml->startTag('MndtRltdInf');
$xml->dataElement('MndtId', $self->_restricted_identification_sepa2($transaction->get('company_number')));
$xml->dataElement('MndtId', $self->_restricted_identification_sepa2($transaction->get('mandator_id')));
$xml->dataElement('DtOfSgntr', $transaction->get('reference_date', 2010-12-02));
$xml->endTag('MndtRltdInf');
bin/mozilla/sepa.pl
foreach my $item (@items) {
my $requested_execution_date;
my $mandator_id;
if ($item->{requested_execution_date}) {
my ($yy, $mm, $dd) = $locale->parse_date($myconfig, $item->{requested_execution_date});
$requested_execution_date = sprintf '%04d-%02d-%02d', $yy, $mm, $dd;
......
if ($vc eq 'customer') {
my ($yy, $mm, $dd) = $locale->parse_date($myconfig, $item->{reference_date});
$item->{reference_date} = sprintf '%04d-%02d-%02d', $yy, $mm, $dd;
$mandator_id = $item->{mandator_id};
}
$sepa_xml->add_transaction({ 'src_iban' => $item->{our_iban},
......
'company_number' => $item->{vc_number},
'amount' => $item->{amount},
'reference' => $item->{reference},
'mandator_id' => $mandator_id,
'reference_date' => $item->{reference_date},
'execution_date' => $requested_execution_date,
'end_to_end_id' => $item->{end_to_end_id} });
locale/de/all
'Make default profile' => 'Zu Standardprofil machen',
'Manage Custom Variables' => 'Benutzerdefinierte Variablen',
'Mandantennummer' => 'Mandantennummer',
'Mandator ID' => 'Mandanten-ID',
'Mandatory Departments' => 'Benutzer muss Abteilungen vergeben',
'Map' => 'Karte',
'Mar' => 'März',
sql/Pg-upgrade2/add_customer_mandator_id.sql
-- @tag: add_customer_mandator_id
-- @description: Einführen einer Mandanten ID Spalte bei Kunden und Lieferanten.
-- @depends: release_3_0_0
ALTER TABLE customer ADD mandator_id text;
ALTER TABLE vendor ADD mandator_id text;
templates/webpages/sepa/bank_transfer_create.html
<th class="listheading">[% 'IBAN' | $T8 %]</th>
<th class="listheading">[% 'BIC' | $T8 %]</th>
<th class="listheading">[% 'Bank' | $T8 %]</th>
[% IF vc == 'customer' %]
<th class="listheading">[% 'Mandator ID' | $T8 %]</th>
[%- END %]
</tr>
[%- FOREACH vbi = VC_BANK_INFO %]
......
<td><input name="vc_bank_info[].iban" size="34" value="[% HTML.escape(vbi.iban.substr(0, 34)) %]" maxlength="34"></td>
<td><input name="vc_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic.substr(0, 20)) %]" maxlength="20"></td>
<td><input name="vc_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
[% IF vc == 'customer' %]
<td><input name="vc_bank_info[].mandator_id" size="30" value="[% HTML.escape(vbi.mandator_id) %]"></td>
[%- END %]
</tr>
[%- END %]
</table>
templates/webpages/sepa/bank_transfer_edit.html
<th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
[%- END %]
<th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
[% IF vc == 'customer' %]
<th class="listheading" align="right">[% 'Mandator ID' | $T8 %]</th>
[%- END %]
<th class="listheading">[% 'Reference' | $T8 %]</th>
<th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
<th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
......
<th class="listheading">[% 'IBAN' | $T8 %]</th>
<th class="listheading">[% 'BIC' | $T8 %]</th>
[%- IF show_post_payments_button %]
<th class="listheading" colspan="3">&nbsp;</th>
<th class="listheading" colspan="[% IF vc == 'customer' %]4[% ELSE %]3[% END %]">&nbsp;</th>
<th class="listheading">
[% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]
</th>
......
<td>[% HTML.escape(item.vc_iban) %]</td>
<td>[% HTML.escape(item.vc_bic) %]</td>
<td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
[% IF vc == 'customer' %]
<td>[% HTML.escape(item.mandator_id) %]</td>
[%- END %]
<td>[% HTML.escape(item.reference) %]</td>
<td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
<td align="right" nowrap>

Auch abrufbar als: Unified diff