[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch debian-jessie-2.8 updated. debian/2.8.1-1-4-ge397534
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Dec 4 21:40:44 UTC 2014
The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-anglo-saxon.git;a=commitdiff;h=debian/2.8.1-1-4-ge397534
commit e397534c8ecedab63400eb3b7cb7d02b52425b34
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 19:12:53 2014 +0100
Releasing debian version 2.8.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index e8e61d2..76f7b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-stock-anglo-saxon (2.8.2-1) unstable; urgency=medium
+
+ * Fixing the branch version in the watch file.
+ * Merging upstream version 2.8.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 04 Dec 2014 19:12:53 +0100
+
tryton-modules-account-stock-anglo-saxon (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit 321f7d0375233b451f24390746422f481488c48c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 19:12:52 2014 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index ba59f82..6a183dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2010-2013 Cédric Krier
- 2010-2013 B2CK SPRL
+Copyright: 2010-2014 Cédric Krier
+ 2010-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit f7eaf20f2acf5cb14629d31447d2c4bc5d975621
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 19:12:52 2014 +0100
Merging upstream version 2.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index 7125dea..cd02a6d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.1 - 2013-10-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7e8c156..c655746 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2013 Cédric Krier.
-Copyright (C) 2010-2013 B2CK SPRL.
+Copyright (C) 2010-2014 Cédric Krier.
+Copyright (C) 2010-2014 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 52d9e53..f949359 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_stock_anglo_saxon
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/stock.py b/stock.py
index ef7a979..fa8bb98 100644
--- a/stock.py
+++ b/stock.py
@@ -92,7 +92,7 @@ class Move:
if consumed_qty >= quantity:
break
- if type_.startswith('in_'):
+ if type_ == 'in_supplier':
with Transaction().set_context(date=move.effective_date):
unit_price = Currency.compute(move.currency,
move.unit_price, move.company.currency, round=False)
@@ -102,6 +102,7 @@ class Move:
cost_price = move.cost_price
yield (move, qty, cost_price)
+ consumed_qty += qty
@classmethod
def update_anglo_saxon_quantity_product_cost(cls, product, moves,
diff --git a/tryton.cfg b/tryton.cfg
index 7f46675..59bb639 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=2.8.2
depends:
account
account_invoice
diff --git a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
index 53ff22b..52e3cdc 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
+++ b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-stock-anglo-saxon
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt b/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
index ba8b9e8..1cf5c37 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
+++ b/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
@@ -9,11 +9,27 @@ product.xml
setup.py
tryton.cfg
./__init__.py
+./account.xml
./invoice.py
./product.py
+./product.xml
./stock.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
./tests/__init__.py
+./tests/scenario_account_stock_anglo_saxon.rst
./tests/test_account_stock_anglo_saxon.py
+./view/category_form.xml
+./view/template_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
--
tryton-modules-account-stock-anglo-saxon
More information about the tryton-debian-vcs
mailing list