Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index 0817ae6c606505ae55ef9809f01e198843246696..fa5d649357965257c3f9b95fe06b158370146866 100644 (file)
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -142,6 +142,18 @@ sub _create_periodic_invoice {
 
     $invoice->post(ar_id => $config->ar_chart_id) || die;
 
+    # like $form->add_shipto, but we don't need to check for a manual exception,
+    # because we can already assume this (otherwise no shipto_id from order)
+    if ($order->shipto_id) {
+
+      my $shipto_oe = SL::DB::Manager::Shipto->find_by(shipto_id => $order->shipto_id);
+      my $shipto_ar = $shipto_oe->clone_and_reset;
+
+      $shipto_ar->module('AR');            # alter module OE -> AR
+      $shipto_ar->trans_id($invoice->id);  # alter trans_id -> new id from invoice
+      $shipto_ar->save;
+    }
+
     $order->link_to_record($invoice);
 
     SL::DB::PeriodicInvoice->new(config_id         => $config->id,

diff --git a/SL/DB/Shipto.pm b/SL/DB/Shipto.pm
index 8795a1b50d52b914946812b3f946554de69fc158..1b174c011aa06196877028f625da89da070bfad7 100644 (file)
--- a/SL/DB/Shipto.pm
+++ b/SL/DB/Shipto.pm
@@ -3,6 +3,7 @@ package SL::DB::Shipto;
 use strict;
 
 use SL::DB::MetaSetup::Shipto;
+use Rose::DB::Object::Helpers qw(clone_and_reset clone);
 
 our @SHIPTO_VARIABLES = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
                            shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2);

diff --git a/doc/changelog b/doc/changelog
index 240b18347bc9ad3143dfd54571ed2c4546eaf474..126877b7ae1babee6cb8e1d3b335008df5fb15e6 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -108,6 +108,8 @@ Bugfixes:
  - Stornierte Rechnungen (sowohl die Stornorechnung als auch das Storno nicht
    Buchen oder Löschen, egal was in der Mandantenkonfiguration steht)
  - Wiederkehrende Rechnung mit Steuer inklusive buchen Erlöse falsch (Bug 2314)
+ - manuelle Lieferadresse im Auftrag wird nicht in wiederkehrende Rechung übernommen (Bug 2296)
+
 
 2012-12-10 - Release 3.0.0