[tryton-debian-vcs] tryton-modules-account-invoice-stock branch upstream-3.6 updated. upstream/3.6.0-1-ga9c96c8

[Mathias Behrle]

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

commit a9c96c866b066845dc515e9be7d16a70209c5ace
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:43:28 2015 +0100

    Adding upstream version 3.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 24733d1..36007f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 2bc7134..99cc5f5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice_stock
-Version: 3.6.0
+Version: 3.6.1
 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 60d853d..64dca57 100644
--- a/account.py
+++ b/account.py
@@ -38,3 +38,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 1e41bda..14dcf4a 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 06e7480..ccf3810 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 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 582a51b..b749b2b 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.6.0
+Version: 3.6.1
 Summary: Tryton module to link stock and invoice
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice-stock