[tryton-debian-vcs] tryton-modules-stock branch debian-wheezy-2.6 created. 33c1d58c7036eff0d48c59f36a6ebe9e19e6dc28
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:10:21 UTC 2013
The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=33c1d58c7036eff0d48c59f36a6ebe9e19e6dc28
commit 33c1d58c7036eff0d48c59f36a6ebe9e19e6dc28
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:05:33 2013 +0100
Removing inadvertently commited .pc directory.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit 1bb81fe6f74052a3dffbe87b9b9ddda66a12b263
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 17:00:34 2013 +0200
Releasing debian version 2.6.4-1.
diff --git a/debian/changelog b/debian/changelog
index 7de7ce4..fc1cb0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (2.6.4-1) unstable; urgency=low
+
+ * Merging upstream version 2.6.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 07 Aug 2013 16:48:29 +0200
+
tryton-modules-stock (2.6.3-1) unstable; urgency=low
* Merging upstream version 2.6.3.
commit 13f15ffb38636fc284cadca5ef1b3313a56c9544
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 16:42:20 2013 +0200
Merging 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 1c97c13d9cb7b40aa05c51ecb4a7d1db2849e657
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 13:42:26 2013 +0200
Releasing debian version 2.6.3-1.
diff --git a/debian/changelog b/debian/changelog
index 39200bb..7de7ce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (2.6.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.6.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 10 Jun 2013 18:21:46 +0200
+
tryton-modules-stock (2.6.2-1) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704400).
commit 14c958bdbe55d340fd7ca2b804be244dcc95a9d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:13:04 2013 +0200
Merging 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 37e785462680318599c870847c1cbd83acfe8214
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 12:07:19 2013 +0200
Releasing debian version 2.6.2-1.
diff --git a/debian/changelog b/debian/changelog
index 5a0499d..39200bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock (2.6.2-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704400).
+ * Versioning watch file for Tryton branch 2.6.
+ * Improving update of major version in Depends.
+ * Merging upstream version 2.6.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 04 May 2013 02:39:12 +0200
+
tryton-modules-stock (2.6.1-2) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit bf46ba3b0abea458397e1f35b18e62ba3bada675
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:12:38 2013 +0200
Merging 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
commit 1de1c6f0410a57b491a80be9707c227e8bdbffd4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 67d594f..870017a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,11 @@ X-Python-Version: >= 2.6
Package: tryton-modules-stock
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-currency (>= 2.6),
- tryton-modules-party (>= 2.6), tryton-modules-product (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-currency (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Stock Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit d985e331aec889ae17d880aa2b0259df1ac09514
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 24 00:59:49 2013 +0200
Versioning watch file for Tryton branch 2.6.
diff --git a/debian/watch b/debian/watch
index 61a18c5..0ed4b71 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_stock-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list