[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch upstream-2.8 updated. upstream/2.8.3-1-g6eaea74

[Mathias Behrle]

The following commit has been merged in the upstream-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=upstream/2.8.3-1-g6eaea74

commit 6eaea74fafe8ae2701deddcfc9c70dbf9636f2e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 20:37:20 2015 +0200

    Adding upstream version 2.8.4.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 385a6b0..93b0f63 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.4 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.3 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index fd9070a..e2b3596 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_anglo_saxon
-Version: 2.8.3
+Version: 2.8.4
 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 fa8bb98..cc32bea 100644
--- a/stock.py
+++ b/stock.py
@@ -92,7 +92,7 @@ class Move:
             if consumed_qty >= quantity:
                 break
 
-            if type_ == 'in_supplier':
+            if type_.endswith('supplier'):
                 with Transaction().set_context(date=move.effective_date):
                     unit_price = Currency.compute(move.currency,
                         move.unit_price, move.company.currency, round=False)
@@ -130,6 +130,7 @@ class Move:
 
             cost += move_cost_price * Decimal(str(move_qty))
 
+            move_qty = Uom.compute_qty(product.default_uom, move_qty, move.uom)
             with Transaction().set_user(0, set_context=True):
                 cls.write([move], {
                     'anglo_saxon_quantity': ((move.anglo_saxon_quantity or 0.0)
diff --git a/tryton.cfg b/tryton.cfg
index d193208..f516542 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.3
+version=2.8.4
 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 38cecc9..7b7471d 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.3
+Version: 2.8.4
 Summary: Tryton module for anglo-saxon real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-stock-anglo-saxon