From d12029c684b6b2a478bf35b9722dbeb887ad0c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:25 +0200 Subject: [PATCH 01/11] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index c4e0a859e3..4cd7fecb1b 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: ir purchase From a05eca4e788fb21403ff14cb9d2307745c8f3554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 May 2013 19:02:25 +0200 Subject: [PATCH 02/11] Don't create duplicate move supply_on_sale could be changed between two calls on get_move so we must also check if a purchase request is not yet created. review857002 (transplanted from b8717ff3e5597d65046fb9da828b56a82d45b512) --- sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index ca3c5ab5f3..ff52cc23e7 100644 --- a/sale.py +++ b/sale.py @@ -82,7 +82,8 @@ class SaleLine: def get_move(self, shipment_type): move = super(SaleLine, self).get_move(shipment_type) if (shipment_type == 'out' - and self.supply_on_sale): + and (self.supply_on_sale + or self.purchase_request)): if self.purchase_request_state in ('', 'requested'): return return move From aab0dce3d6c794c3846a287d7b2ba31c654cfb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 May 2013 19:03:25 +0200 Subject: [PATCH 03/11] Process sale also when processing purchase If Purchase.process creates new stock moves, Sale.process must be called to consider this new moves. review858002 (transplanted from 5c867861be6e5e79aa0fec4e0dc9ad4afb243441) --- purchase.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/purchase.py b/purchase.py index 0f82e9029c..11f1a121ec 100644 --- a/purchase.py +++ b/purchase.py @@ -85,6 +85,13 @@ class Purchase: super(Purchase, cls).confirm(purchases) cls._sale_supply_process(purchases) + @classmethod + def process(cls, purchases): + super(Purchase, cls).process(purchases) + # If not yet confirmed, it will be processed by confirm + if any(p.state == 'confirmed' for p in purchases): + cls._sale_supply_process(purchases) + @classmethod @ModelView.button @Workflow.transition('cancel') From f4e1f8d97b96a970c77c3593aa0c5ae08a8e0f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:57:30 +0200 Subject: [PATCH 04/11] Prepare release 2.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2ff50a4539..02af05b37f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 2.8.1 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.8.0 - 2013-04-22 * Initial release From 95e055eead0e362b7247d9def8099f5cfc8e929a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:57:31 +0200 Subject: [PATCH 05/11] Added tag 2.8.1 for changeset f6ddfc0c775d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 525d963a97..ff5aa94f42 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 9d51a13e8346425ad0304993f732c1e5a20a76c1 2.8.0 +f6ddfc0c775dd0e76331587f8e920a8ad93c922d 2.8.1 From dd8f89b387374522e678d7217f89704af95d689f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:57:40 +0200 Subject: [PATCH 06/11] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 4cd7fecb1b..ef24d67f2a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.2 depends: ir purchase From 6767337f0f2df716ca7714fab8ffe531b9ec0d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Sep 2013 00:16:36 +0200 Subject: [PATCH 07/11] Use the warehouse of the line to create request review1086002 (transplanted from 7b39a52f34cb49907f9f27bb2983b00bf37ab661) --- sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.py b/sale.py index ff52cc23e7..deb97ed9e1 100644 --- a/sale.py +++ b/sale.py @@ -113,7 +113,7 @@ class SaleLine: purchase_date=purchase_date, supply_date=self.delivery_date, company=self.sale.company, - warehouse=self.sale.warehouse, + warehouse=self.warehouse, origin=self.sale, ) From 4f1a179f8734715e04557ca4944ad28bbdbe2f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:11:31 +0100 Subject: [PATCH 08/11] Prepare release 2.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 02af05b37f..9b74847d86 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.2 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.8.1 - 2013-06-09 * Bug fixes (see mercurial logs for details) From 62cdef0a44532dd13ea08bf0f9158c6c0cf9cf3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:11:32 +0100 Subject: [PATCH 09/11] Added tag 2.8.2 for changeset 1e7caf7f4325 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ff5aa94f42..dcd44737cb 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 9d51a13e8346425ad0304993f732c1e5a20a76c1 2.8.0 f6ddfc0c775dd0e76331587f8e920a8ad93c922d 2.8.1 +1e7caf7f43257232ec989198d5347a751ce40397 2.8.2 From f6cff67bb954b865479389b5a3de12e305007834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:13:31 +0100 Subject: [PATCH 10/11] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index ef24d67f2a..1c2d032cd8 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.2 +version=2.8.3 depends: ir purchase From 95e4a6c6409f61f80a4488d7dcd2f5fb9c13fcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Feb 2014 18:57:33 +0100 Subject: [PATCH 11/11] Do not created purchase request when moves exist for the sale line issue3651 review3191004 (transplanted from a7db0cb0f2509471b958347e0c583cc4606317a8) --- sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index deb97ed9e1..9be31f9f93 100644 --- a/sale.py +++ b/sale.py @@ -75,7 +75,8 @@ class SaleLine: if (self.type != 'line' or not self.product or self.quantity <= 0 - or not self.product.purchasable): + or not self.product.purchasable + or any(m.state != 'cancel' for m in self.moves)): return False return self.product.supply_on_sale