X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FZUGFeRD.pm;h=f989d3d949c3853a834400039a2e680cccd9df43;hb=4dc48e117cfdb6e59c2d8b9d8087ef8a3bc245a4;hp=017bbc535ae266833ad447c1412fec4560b83ea8;hpb=ba40069b4f465cd51d509ab280d1c6e61652bda9;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/ZUGFeRD.pm b/SL/DB/Helper/ZUGFeRD.pm
index 017bbc535..f989d3d94 100644
--- a/SL/DB/Helper/ZUGFeRD.pm
+++ b/SL/DB/Helper/ZUGFeRD.pm
@@ -27,6 +27,9 @@ my @line_names = qw(LineOne LineTwo LineThree);
 
 my %standards_ids = (
   PROFILE_FACTURX_EXTENDED() => 'urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended',
+  PROFILE_XRECHNUNG()        => 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0',
+);
+
 sub _is_profile {
   my ($self, @profiles) = @_;
   return any { $self->{_zugferd}->{profile} == $_ } @profiles;
@@ -288,6 +291,17 @@ sub _format_payment_terms_description {
   $description    =~ s{<\%$_\%>}{ $params{vars}->{$_} }ge              for keys %{ $params{vars} };
   $description    =~ s{<\%$_\%>}{ $params{formatted_amounts}->{$_} }ge for keys %{ $params{formatted_amounts} };
 
+  if (_is_profile($self, PROFILE_XRECHNUNG())) {
+    my @terms;
+
+    if ($self->payment_terms->terms_skonto && ($self->payment_terms->percent_skonto * 1)) {
+      push @terms, sprintf("#SKONTO#TAGE=\%d#PROZENT=\%.2f#\n", $self->payment_terms->terms_skonto, $self->payment_terms->percent_skonto * 100);
+    }
+
+    $description =~ s{#}{_}g;
+    $description =  join('', @terms) . $description;
+  }
+
   return $description;
 }
 
@@ -309,7 +323,9 @@ sub _payment_terms {
   $params{xml}->endTag;
   #       </ram:DueDateDateTime>
 
-  if ($self->payment_terms->percent_skonto && $self->payment_terms->terms_skonto) {
+  if (   _is_profile($self, PROFILE_FACTURX_EXTENDED())
+      && $self->payment_terms->percent_skonto
+      && $self->payment_terms->terms_skonto) {
     my $currency_id = _u8(SL::Helper::ISO4217::map_currency_name_to_code($self->currency->name) // 'EUR');
 
     #       <ram:ApplicableTradePaymentDiscountTerms>
@@ -376,7 +392,7 @@ sub _exchanged_document {
   $params{xml}->startTag("rsm:ExchangedDocument");
 
   $params{xml}->dataElement("ram:ID",       _u8($self->invnumber));
-  $params{xml}->dataElement("ram:Name",     _u8(_type_name($self)));
+  $params{xml}->dataElement("ram:Name",     _u8(_type_name($self))) if _is_profile($self, PROFILE_FACTURX_EXTENDED());
   $params{xml}->dataElement("ram:TypeCode", _u8(_type_code($self)));
 
   #     <ram:IssueDateTime>
@@ -385,7 +401,9 @@ sub _exchanged_document {
   $params{xml}->endTag;
   #     </ram:IssueDateTime>
 
-  if ($self->language && (($self->language->template_code // '') =~ m{^(de|en)}i)) {
+  if (   _is_profile($self, PROFILE_FACTURX_EXTENDED())
+      && $self->language
+      && (($self->language->template_code // '') =~ m{^(de|en)}i)) {
     $params{xml}->dataElement("ram:LanguageID", uc($1));
   }
 
@@ -507,6 +525,8 @@ sub _applicable_header_trade_agreement {
   #     <ram:ApplicableHeaderTradeAgreement>
   $params{xml}->startTag("ram:ApplicableHeaderTradeAgreement");
 
+  $params{xml}->dataElement("ram:BuyerReference", _u8($self->customer->c_vendor_routing_id)) if $self->customer->c_vendor_routing_id;
+
   _seller_trade_party($self, %params);
   _buyer_trade_party($self, %params);
 
@@ -620,6 +640,12 @@ sub _validate_data {
     }
   }
 
+  if (_is_profile($self, PROFILE_XRECHNUNG())) {
+    if (!$self->customer->c_vendor_routing_id) {
+      SL::X::ZUGFeRDValidation->throw(message => $prefix . $::locale->text('The value \'our routing id at customer\' must be set in the customer\'s master data for profile #1.', 'XRechnung 2.0'));
+    }
+  }
+
   return %result;
 }