[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch debian-jessie-3.4 updated. debian/3.4.1-1-4-g4182048

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.4 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.4.1-1-4-g4182048

commit 41820485c6a9146e4426623bd1e50c9618f16dd7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 20:40:21 2015 +0200

    Releasing debian version 3.4.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index edb6e99..69c0cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-stock-anglo-saxon (3.4.2-1) unstable; urgency=medium
+
+  * Wrapping and sorting control files (wrap-and-sort -bts).
+  * Setting the branch in the watch file to the fixed version 3.4.
+  * Merging upstream version 3.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 23 May 2015 20:40:21 +0200
+
 tryton-modules-account-stock-anglo-saxon (3.4.1-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit dc47427a72dfe2f6abd7a4d28deca7fa751f11d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 20:40:20 2015 +0200

    Merging upstream version 3.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index 6ba35ab..9612272 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.1 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 3f9ab1b..997953c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_anglo_saxon
-Version: 3.4.1
+Version: 3.4.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 f3dcae0..54120c5 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)
             cls.write([move], {
                     as_qty_field: (
                         (getattr(move, as_qty_field) or 0.0) + move_qty),
diff --git a/tryton.cfg b/tryton.cfg
index c0e3f21..b5fd402 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.4.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 d97758d..311b769 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.4.1
+Version: 3.4.2
 Summary: Tryton module for anglo-saxon real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-stock-anglo-saxon