Revision 3cb3fcdf
Von Cem Aydin vor mehr als 1 Jahr hinzugefügt
| SL/Template/OpenDocument.pm | ||
|---|---|---|
|
use SL::Template::OpenDocument::Styles;
|
||
|
|
||
|
use SL::Helper::QrBill;
|
||
|
use SL::Helper::QrBillFunctions qw(get_ref_number_formatted get_iban_formatted get_amount_formatted);
|
||
|
use SL::Helper::QrBillFunctions qw(
|
||
|
get_ref_number_formatted get_iban_formatted get_amount_formatted
|
||
|
get_street_name_from_address_line get_building_number_from_address_line
|
||
|
);
|
||
|
|
||
|
use Cwd;
|
||
|
# use File::Copy;
|
||
| ... | ... | |
|
$::form->error($::locale->text('Error mapping biller countrycode.'));
|
||
|
}
|
||
|
my %biller_data = (
|
||
|
address_type => 'K',
|
||
|
address_type => 'S',
|
||
|
company => $::instance_conf->get_company(),
|
||
|
address_row1 => $::instance_conf->get_address_street1(),
|
||
|
address_row2 => $::instance_conf->get_address_zipcode() . ' ' . $::instance_conf->get_address_city(),
|
||
|
street => get_street_name_from_address_line($::instance_conf->get_address_street1()),
|
||
|
street_no => get_building_number_from_address_line($::instance_conf->get_address_street1()),
|
||
|
postalcode => $::instance_conf->get_address_zipcode(),
|
||
|
city => $::instance_conf->get_address_city(),
|
||
|
countrycode => $form->{qrbill_biller_countrycode},
|
||
|
);
|
||
|
|
||
| ... | ... | |
|
currency => $form->{currency},
|
||
|
);
|
||
|
|
||
|
# get address data from billing address if given, otherwise from invoice
|
||
|
my $street_name = get_street_name_from_address_line($form->{billing_address_id} ?
|
||
|
$form->{billing_address_street} :
|
||
|
$form->{street});
|
||
|
my $building_number = get_building_number_from_address_line($form->{billing_address_id} ?
|
||
|
$form->{billing_address_street} :
|
||
|
$form->{street});
|
||
|
my $postalcode = $form->{billing_address_id} ?
|
||
|
$form->{billing_address_zipcode} :
|
||
|
$form->{zipcode};
|
||
|
my $city = $form->{billing_address_id} ?
|
||
|
$form->{billing_address_city} :
|
||
|
$form->{city};
|
||
|
|
||
|
# validate address data
|
||
|
if (!$form->{'street'}) {
|
||
|
$::form->error($::locale->text('No street given.'));
|
||
|
}
|
||
|
if ($form->{'zipcode'} !~ m/^\d{4,}$/) {
|
||
|
if ($postalcode !~ m/^\d{4,}$/) {
|
||
|
$::form->error($::locale->text('Zipcode missing or wrong format.'));
|
||
|
}
|
||
|
if (!$form->{'city'}) {
|
||
|
if (!$city) {
|
||
|
$::form->error($::locale->text('No city given.'));
|
||
|
}
|
||
|
|
||
|
if (!$form->{qrbill_customer_countrycode}) {
|
||
|
$::form->error($::locale->text('Error mapping customer countrycode.'));
|
||
|
}
|
||
|
|
||
|
my %invoice_recipient_data = (
|
||
|
address_type => 'K',
|
||
|
address_type => 'S',
|
||
|
name => $form->{billing_address_id} ?
|
||
|
$form->{billing_address_name} :
|
||
|
$form->{name},
|
||
|
address_row1 => $form->{billing_address_id} ?
|
||
|
$form->{billing_address_street} :
|
||
|
$form->{street},
|
||
|
address_row2 => $form->{billing_address_id} ?
|
||
|
$form->{billing_address_zipcode} . ' ' . $form->{billing_address_city} :
|
||
|
$form->{zipcode} . ' ' . $form->{city},
|
||
|
street => $street_name,
|
||
|
street_no => $building_number,
|
||
|
postalcode => $postalcode,
|
||
|
city => $city,
|
||
|
countrycode => $form->{qrbill_customer_countrycode},
|
||
|
);
|
||
|
|
||
| doc/changelog | ||
|---|---|---|
|
|
||
|
Kleinere neue Features und Detailverbesserungen:
|
||
|
|
||
|
- Schweizer QR-Rechnungen: Bei der Erzeugung via OpenDocument, innerhalb des QR-Code
|
||
|
Adresstyp S anstatt K verwenden
|
||
|
- Bei den Bankkonten Auswahlmöglichkeit hinzugefügt, ob das Konto für den Bankimport
|
||
|
verwendet (und somit für manuelle Buchungen gesperrt) werden soll
|
||
|
(Standardwert und für bestehende Mandanten: Ja)
|
||
| locale/de/all | ||
|---|---|---|
|
'No shipto selected to delete' => 'Keine Lieferadresse zum Löschen ausgewählt',
|
||
|
'No start date given, setting to #1' => 'Kein Startdatum gegeben, setze Startdatum auf #1',
|
||
|
'No stock to transfer' => 'Keine Lagerbewegungen vorhanden',
|
||
|
'No street given.' => 'Straße fehlt.',
|
||
|
'No such job #1 in the database.' => 'Hintergrund-Job #1 existiert nicht mehr.',
|
||
|
'No summary account' => 'Kein Sammelkonto',
|
||
|
'No superuser credentials were entered.' => 'Es wurden keine Super-Benutzer-Anmeldedaten eingegeben.',
|
||
| locale/en/all | ||
|---|---|---|
|
'No shipto selected to delete' => '',
|
||
|
'No start date given, setting to #1' => '',
|
||
|
'No stock to transfer' => '',
|
||
|
'No street given.' => '',
|
||
|
'No such job #1 in the database.' => '',
|
||
|
'No summary account' => '',
|
||
|
'No superuser credentials were entered.' => '',
|
||
Auch abrufbar als: Unified diff
Schweizer QR-Rechnung: Adressen auf Adresstyp S umstellen
- innerhalb des QR-Code Adresstyp S verwenden
- Validierung angepasst: Strasse und Hausnummer können leer sein
- changelog Eintrag
- locale update