[tryton-debian-vcs] tryton-modules-account-invoice-stock branch debian-jessie-3.4 updated. debian/3.4.1-1-4-g5789670

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice-stock.git;a=commitdiff;h=debian/3.4.1-1-4-g5789670

commit 5789670cd95859354729493682b22dc6f7016fb9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:42:25 2015 +0100

    Releasing debian version 3.4.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index ffedeba..2267d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-invoice-stock (3.4.2-1) unstable; urgency=medium
+
+  * Wrapping and sorting control files (wrap-and-sort -bts).
+  * Setting the branch in the watch file to the fixed version 3.4.
+  * Merging upstream version 3.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 15:42:25 +0100
+
 tryton-modules-account-invoice-stock (3.4.1-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 791bbc418002e0ee3c1bf1a7dbd738df173f5d95
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:42:24 2015 +0100

    Merging upstream version 3.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index bc704d6..34aace3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.1 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index f701e67..3de1a5e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice_stock
-Version: 3.4.1
+Version: 3.4.2
 Summary: Tryton module to link stock and invoice
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index e53c366..33d9d57 100644
--- a/account.py
+++ b/account.py
@@ -33,3 +33,12 @@ class InvoiceLine:
             quantity += Uom.compute_qty(stock_move.uom, stock_move.quantity,
                 self.unit)
         return quantity
+
+    @classmethod
+    def copy(cls, lines, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+        default.setdefault('stock_moves', None)
+        return super(InvoiceLine, cls).copy(lines, default=default)
diff --git a/stock.py b/stock.py
index 93294cd..d5bca08 100644
--- a/stock.py
+++ b/stock.py
@@ -23,3 +23,12 @@ class StockMove:
             quantity += Uom.compute_qty(invoice_line.unit,
                 invoice_line.quantity, self.uom)
         return quantity
+
+    @classmethod
+    def copy(cls, moves, default=None):
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+        default.setdefault('invoice_lines', None)
+        return super(StockMove, cls).copy(moves, default=default)
diff --git a/tryton.cfg b/tryton.cfg
index 6d285a8..652b6ec 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.4.2
 depends:
     account_invoice
     stock
diff --git a/trytond_account_invoice_stock.egg-info/PKG-INFO b/trytond_account_invoice_stock.egg-info/PKG-INFO
index a6893ed..11d833e 100644
--- a/trytond_account_invoice_stock.egg-info/PKG-INFO
+++ b/trytond_account_invoice_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-invoice-stock
-Version: 3.4.1
+Version: 3.4.2
 Summary: Tryton module to link stock and invoice
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice-stock