[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch debian-jessie-3.0 updated. debian/3.0.1-1-5-g9c466d2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:50:30 UTC 2014
The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-anglo-saxon.git;a=commitdiff;h=debian/3.0.1-1-5-g9c466d2
commit 9c466d2c1bd87aac97d971457ac83797287dc7ce
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:52:36 2014 +0100
Releasing debian version 3.0.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 5960b02..36d3bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account-stock-anglo-saxon (3.0.2-1) unstable; urgency=medium
+
+ * Setting the branch in the watch file to the fixed version 3.0.
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 12 Nov 2014 13:52:36 +0100
+
tryton-modules-account-stock-anglo-saxon (3.0.1-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 9bda1073e5a42d7c856740a576a5cdae8eabbe26
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:52:35 2014 +0100
Merging upstream version 3.0.2.
diff --git a/CHANGELOG b/CHANGELOG
index cdb9c54..08f5121 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.1 - 2014-03-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 454618b..36ed465 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_stock_anglo_saxon
-Version: 3.0.1
+Version: 3.0.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 1cc988d..5f88f79 100644
--- a/stock.py
+++ b/stock.py
@@ -131,7 +131,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)
@@ -141,6 +141,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/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
index a94d5cb..651967a 100644
--- a/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
+++ b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
@@ -17,6 +17,7 @@ Imports::
Create database::
>>> config = config.set_trytond()
+ >>> config.pool.test = True
Install sale_supply, sale, purchase::
diff --git a/tryton.cfg b/tryton.cfg
index 320fba7..a76fe3a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.0.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 1d80134..6080391 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: 3.0.1
+Version: 3.0.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 f0935a2..413234f 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
+++ b/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
@@ -9,11 +9,29 @@ 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
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_account_stock_anglo_saxon.rst
+./tests/scenario_account_stock_anglo_saxon_with_drop_shipment.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