[tryton-debian-vcs] tryton-modules-purchase branch upstream-2.6 created. 6a068151715452851ef8ba9c06ffb4761cb47b39

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=6a068151715452851ef8ba9c06ffb4761cb47b39
commit 6a068151715452851ef8ba9c06ffb4761cb47b39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:15:42 2013 +0200

    Adding upstream version 2.6.3.

diff --git a/CHANGELOG b/CHANGELOG
index 0b606e4..5ac8b2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.2 - 2013-05-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 146b20b..f77119e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index bf7c732..3bf5f56 100644
--- a/invoice.py
+++ b/invoice.py
@@ -56,8 +56,8 @@ class Invoice:
             cursor.execute('SELECT id FROM purchase_invoices_rel ' \
                 'WHERE invoice IN (' + ','.join(('%s',) * len(invoices)) + ')',
                 [i.id for i in invoices])
-        if cursor.fetchone():
-            cls.raise_user_error('delete_purchase_invoice')
+            if cursor.fetchone():
+                cls.raise_user_error('delete_purchase_invoice')
         super(Invoice, cls).delete(invoices)
 
     @classmethod
diff --git a/purchase.py b/purchase.py
index 1114480..2e59ad9 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1120,6 +1120,7 @@ class PurchaseLine(ModelSQL, ModelView):
         invoice_line.note = self.note
         if self.type != 'line':
             if (self.purchase.invoice_method == 'order'
+                    and not self.invoice_lines
                     and ((all(l.quantity >= 0 for l in self.purchase.lines
                                 if l.type == 'line')
                             and invoice_type == 'in_invoice')
diff --git a/tryton.cfg b/tryton.cfg
index 9ec5b0b..ef5e959 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.2
+version=2.6.3
 depends:
     account
     account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index cb0d099..3a40c9f 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-purchase
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
commit d3c2aef33d3a704ec8757d45d0a07a86d8638e93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:30 2013 +0200

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 7f55da7..0b606e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-12-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..6e948f6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index ee5c3e1..146b20b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase.py b/purchase.py
index 6b1dce4..1114480 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1586,7 +1586,7 @@ class ShipmentIn:
 
             with Transaction().set_user(0, set_context=True):
                 purchases = Purchase.browse([p.id for p in purchases])
-            Purchase.process(purchases)
+                Purchase.process(purchases)
 
     @classmethod
     @ModelView.button
@@ -1634,7 +1634,7 @@ class ShipmentInReturn:
 
             with Transaction().set_user(0, set_context=True):
                 purchases = Purchase.browse([p.id for p in purchases])
-            Purchase.process(purchases)
+                Purchase.process(purchases)
 
     @classmethod
     @ModelView.button
@@ -1753,7 +1753,7 @@ class Move(ModelSQL, ModelView):
             if purchases:
                 with Transaction().set_user(0, set_context=True):
                     purchases = Purchase.browse([p.id for p in purchases])
-                Purchase.process(purchases)
+                    Purchase.process(purchases)
 
     @classmethod
     def delete(cls, moves):
@@ -1774,7 +1774,7 @@ class Move(ModelSQL, ModelView):
             if purchases:
                 with Transaction().set_user(0, set_context=True):
                     purchases = Purchase.browse([p.id for p in purchases])
-                Purchase.process(purchases)
+                    Purchase.process(purchases)
 
 
 class OpenSupplier(Wizard):
diff --git a/tryton.cfg b/tryton.cfg
index 675c575..9ec5b0b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account
     account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index a581e0d..cb0d099 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-purchase
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-purchase