[tryton-debian-vcs] tryton-modules-account-stock-continental branch debian-wheezy-2.6 created. a0186660a5abe5f7abb838f8ff4a0a18ebf4b929

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:57:27 UTC 2013 

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

    Releasing debian version 2.6.3-1.

diff --git a/debian/changelog b/debian/changelog
index 54dbf82..f1fa0d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-stock-continental (2.6.3-1) unstable; urgency=low
+
+  * Merging upstream version 2.6.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 10 Jun 2013 18:20:08 +0200
+
 tryton-modules-account-stock-continental (2.6.2-1) experimental; urgency=low
 
   * Versioning watch file for Tryton branch 2.6.
commit 0d8640d63ba8e899eddea701917be9655ec0f2ea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:13:01 2013 +0200

    Merging 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 7d9b5f77f6d87c1776e7b004f99ca40caa347a8e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:17 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 29def6a..54dbf82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-stock-continental (2.6.2-1) experimental; urgency=low
+
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.2.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 04 May 2013 02:38:40 +0200
+
 tryton-modules-account-stock-continental (2.6.1-1) experimental; urgency=low
 
   * Initial packaging.
commit 6884fc51b4db08c61cb9fd055d5a508f65ae8489
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:14:00 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 7f8727a..ba59f82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2010-2012 Cédric Krier
-           2010-2012 B2CK SPRL
+Copyright: 2010-2013 Cédric Krier
+           2010-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit e8dec86ded91613020adf1de3dfa124fadfad4da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:21 2013 +0200

    Merging 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
commit d80dd1b4a26acb7e5e45c752a084a4ab020cee2c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:47 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 1fa9fe9..82f4a60 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,10 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-account-stock-continental
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account (>= 2.6), tryton-modules-account-product (>= 2.6),
- tryton-modules-stock (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account (>= ${version:major}),
+ tryton-modules-account-product (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Account Stock Continental Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit 462c2483ac6f2a837ba75b95bb2cdbd9e026d181
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:37 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index c00a0b2..f62d3e6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_account_stock_continental-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_account_stock_continental-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-account-stock-continental

More information about the tryton-debian-vcs mailing list