[tryton-debian-vcs] tryton-modules-stock branch upstream-2.6 created. 2d5581e5317940a8d3a6e0ee20c922ff4b7c1047
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:10:23 UTC 2013
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-stock.git;a=commitdiff;h=2d5581e5317940a8d3a6e0ee20c922ff4b7c1047
commit 2d5581e5317940a8d3a6e0ee20c922ff4b7c1047
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 16:42:19 2013 +0200
Adding upstream version 2.6.4.
diff --git a/CHANGELOG b/CHANGELOG
index 3a298ef..2a0a47b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.4 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.3 - 2013-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 13e44cf..c6ffbe8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 2.6.3
+Version: 2.6.4
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 2a3ddf1..07d3fe3 100644
--- a/product.py
+++ b/product.py
@@ -393,8 +393,8 @@ class Product:
if periods:
period, = periods
state_date_clause += (' AND '
- '(COALESCE(effective_date, planned_date) > %s)')
- state_date_vals.append(period.date)
+ '(COALESCE(effective_date, planned_date, %s) > %s)')
+ state_date_vals.extend([datetime.date.max, period.date])
period_vals[0] = period.id
if with_childs:
diff --git a/tryton.cfg b/tryton.cfg
index 0383151..fb925e2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.3
+version=2.6.4
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 6f1cf64..8011b5b 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: 2.6.3
+Version: 2.6.4
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
commit 3ed01a4687fc343bdf2d48a67b27ec00799d8be9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:13:01 2013 +0200
Adding upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index 18d1f0a..3a298ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-06-09
+* 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 65279ad..13e44cf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 0fb1753..2a3ddf1 100644
--- a/product.py
+++ b/product.py
@@ -385,9 +385,11 @@ class Product:
context['stock_date_start'], today,
])
else:
- periods = Period.search([
- ('date', '<', context['stock_date_end']),
- ], order=[('date', 'DESC')], limit=1)
+ with Transaction().set_user(0, set_context=True):
+ periods = Period.search([
+ ('date', '<', context['stock_date_end']),
+ ('state', '=', 'closed'),
+ ], order=[('date', 'DESC')], limit=1)
if periods:
period, = periods
state_date_clause += (' AND '
diff --git a/tryton.cfg b/tryton.cfg
index f4ea477..0383151 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 948974f..6f1cf64 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: 2.6.2
+Version: 2.6.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
commit 5ed633cd3fea684fa05ee7294ca06dda0bd4bc02
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:12:34 2013 +0200
Adding upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index ceabd66..18d1f0a 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 - 2013-02-12
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2b0ba30..65279ad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 199ad19..4d85f78 100644
--- a/move.py
+++ b/move.py
@@ -281,6 +281,10 @@ class Move(ModelSQL, ModelView):
if (self.to_location
and self.to_location.type == 'customer'):
return True
+ if (self.from_location and self.to_location
+ and self.from_location.type == 'storage'
+ and self.to_location.type == 'supplier'):
+ return True
return False
@classmethod
@@ -331,9 +335,10 @@ class Move(ModelSQL, ModelView):
company = Company(company)
context = {}
- context['locations'] = Location.search([
+ locations = Location.search([
('type', '=', 'storage'),
])
+ context['locations'] = [l.id for l in locations]
context['stock_date_end'] = Date.today()
with Transaction().set_context(context):
product = Product(product_id)
diff --git a/product.py b/product.py
index 24555fe..0fb1753 100644
--- a/product.py
+++ b/product.py
@@ -284,9 +284,9 @@ class Product:
'(' \
'(effective_date IS NULL) '\
'AND '\
- '(planned_date <= %s) '\
+ '(COALESCE(planned_date, %s) <= %s) '\
'AND '\
- '(planned_date >= %s)'\
+ '(COALESCE(planned_date, %s) >= %s)'\
')'\
'OR '\
'(' \
@@ -302,7 +302,8 @@ class Product:
'done', context.get('stock_assign') and 'assigned' or 'done',
today, today,
'done', 'assigned', 'draft',
- context['stock_date_end'], today,
+ datetime.date.max, context['stock_date_end'],
+ datetime.date.max, today,
context['stock_date_end'], today,
]
@@ -662,12 +663,16 @@ class ProductQuantitiesByWarehouse(ModelSQL, ModelView):
context = {
'stock_date_start': date_start,
'stock_date_end': date,
+ 'forecast': True,
}
with Transaction().set_context(**context):
quantities[date] = Product.products_by_location(
[warehouse_id], [product_id], with_childs=True,
skip_zero=False)[(warehouse_id, product_id)]
- date_start = date + datetime.timedelta(1)
+ try:
+ date_start = date + datetime.timedelta(1)
+ except OverflowError:
+ pass
cumulate = 0
for date in dates:
cumulate += quantities[date]
diff --git a/tryton.cfg b/tryton.cfg
index 18627e8..f4ea477 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 50f6207..948974f 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: 2.6.1
+Version: 2.6.2
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