[tryton-debian-vcs] tryton-modules-account-stock-continental branch upstream-2.6 created. c90581006c5ced68b82e698fbe40008fb4f0adb9

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-continental.git;a=commitdiff;h=c90581006c5ced68b82e698fbe40008fb4f0adb9
commit c90581006c5ced68b82e698fbe40008fb4f0adb9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:13:00 2013 +0200

    Adding upstream version 2.6.3.

diff --git a/CHANGELOG b/CHANGELOG
index 360058f..a203ffc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.2 - 2013-05-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index f768158..ae8869c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_continental
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for continental real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/product.py b/product.py
index 158cd60..cb43842 100644
--- a/product.py
+++ b/product.py
@@ -289,7 +289,7 @@ class UpdateCostPrice(Wizard):
             }
 
     def get_move_lines(self):
-        Line = Pool.get('account.move.line')
+        Line = Pool().get('account.move.line')
         amount = self.show_move.amount
         return [Line(
                 debit=amount if amount > 0 else 0,
diff --git a/tryton.cfg b/tryton.cfg
index b331e44..5a8601b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.2
+version=2.6.3
 depends:
     account
     account_product
diff --git a/trytond_account_stock_continental.egg-info/PKG-INFO b/trytond_account_stock_continental.egg-info/PKG-INFO
index 8be40df..4e9d448 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-stock-continental
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module for continental real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 8e896149478ebb48d0ed806bc826767683c8fa70
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:19 2013 +0200

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 6b47a7a..360058f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index e792a2c..7e8c156 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2013 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 c7ddcae..f768158 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_account_stock_continental
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for continental real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/product.py b/product.py
index 0873a13..158cd60 100644
--- a/product.py
+++ b/product.py
@@ -204,7 +204,7 @@ class UpdateCostPriceShowMove(ModelView):
             ('company', 'in', [Get(Eval('context', {}), 'company'), False]),
             ('id', '!=', Eval('stock_account')),
             ],
-        depends=['company', 'stock_account'], required=True)
+        depends=['stock_account'], required=True)
     description = fields.Char('Description')
 
 
diff --git a/stock.py b/stock.py
index 161b238..4bd1729 100644
--- a/stock.py
+++ b/stock.py
@@ -22,6 +22,7 @@ class Move:
         pool = Pool()
         Uom = pool.get('product.uom')
         AccountMoveLine = pool.get('account.move.line')
+        Currency = pool.get('currency.currency')
         assert type_.startswith('in_') or type_.startswith('out_'), \
             'wrong type'
 
@@ -30,7 +31,9 @@ class Move:
         if ((type_.endswith('supplier')
                     or type_ == 'in_production')
                 and self.product.cost_price_method != 'fixed'):
-            unit_price = self.unit_price
+            with Transaction().set_context(date=self.effective_date):
+                unit_price = Currency.compute(self.currency, self.unit_price,
+                    self.company.currency, round=False)
         else:
             unit_price = Uom.compute_price(self.product.default_uom,
                 self.cost_price, self.uom)
diff --git a/tryton.cfg b/tryton.cfg
index fb4275f..b331e44 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account
     account_product
diff --git a/trytond_account_stock_continental.egg-info/PKG-INFO b/trytond_account_stock_continental.egg-info/PKG-INFO
index 469c27e..8be40df 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-account-stock-continental
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for continental real-time stock valuation
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-stock-continental