[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch upstream-3.0 updated. upstream/3.0.3-1-g356240f

[Mathias Behrle]

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

commit 356240f780c0d3e95513cd994742da22ef5e447f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 20:38:15 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 62d9a52..f92ceba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.4 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.3 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index f02d152..e97812c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_anglo_saxon
-Version: 3.0.3
+Version: 3.0.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 5f88f79..5f7c774 100644
--- a/stock.py
+++ b/stock.py
@@ -131,7 +131,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)
@@ -170,6 +170,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], {
                         as_qty_field: (
diff --git a/tryton.cfg b/tryton.cfg
index de060cb..db3fac9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.3
+version=3.0.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 7b63a16..7638fdf 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.3
+Version: 3.0.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