[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.4 updated. debian/3.4.5-1-2-g110171c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Nov 8 09:32:48 UTC 2016
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-stock.git;a=commitdiff;h=debian/3.4.5-1-2-g110171c
commit 110171ca8eaed3e6ba6f8f32aa4a125060c13cf4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 8 09:24:11 2016 +0100
Releasing debian version 3.4.6-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index b0ba222..400b047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (3.4.6-1) unstable; urgency=medium
+
+ * Merging upstream version 3.4.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 08 Nov 2016 09:24:11 +0100
+
tryton-modules-stock (3.4.5-1) unstable; urgency=medium
* Merging upstream version 3.4.5.
commit 96ee7be75e1a2b412577f989c2a91bc1e4c7e68f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 8 09:24:10 2016 +0100
Merging upstream version 3.4.6.
diff --git a/CHANGELOG b/CHANGELOG
index 560a132..c623c0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.6 - 2016-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.5 - 2016-09-03
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 30338ea..160f1a6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.4.5
+Version: 3.4.6
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index f993dbf..eaf96f9 100644
--- a/move.py
+++ b/move.py
@@ -4,6 +4,8 @@ import datetime
import operator
from decimal import Decimal
from functools import partial
+from itertools import groupby
+
from sql import Literal, Union, Column
from sql.aggregate import Sum
from sql.conditionals import Coalesce
@@ -493,19 +495,21 @@ class Move(Workflow, ModelSQL, ModelView):
@classmethod
def check_period_closed(cls, moves):
Period = Pool().get('stock.period')
- periods = Period.search([
- ('state', '=', 'closed'),
- ], order=[('date', 'DESC')], limit=1)
- if periods:
- period, = periods
- for move in moves:
- date = (move.effective_date if move.effective_date
- else move.planned_date)
- if date and date < period.date:
- cls.raise_user_error('period_closed', {
- 'move': move.rec_name,
- 'period': period.rec_name,
- })
+ for company, moves in groupby(moves, lambda m: m.company):
+ periods = Period.search([
+ ('state', '=', 'closed'),
+ ('company', '=', company.id),
+ ], order=[('date', 'DESC')], limit=1)
+ if periods:
+ period, = periods
+ for move in moves:
+ date = (move.effective_date if move.effective_date
+ else move.planned_date)
+ if date and date < period.date:
+ cls.raise_user_error('period_closed', {
+ 'move': move.rec_name,
+ 'period': period.rec_name,
+ })
def get_rec_name(self, name):
return ("%s%s %s"
diff --git a/tryton.cfg b/tryton.cfg
index 58dd48b..eff83e5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.5
+version=3.4.6
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 8c01fb8..1927ad6 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock
-Version: 3.4.5
+Version: 3.4.6
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list