[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch debian-wheezy-2.6 created. b93144d82c9eb736820c039333b4070deb7e6a1a

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:08:00 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-purchase-shipment-cost.git;a=commitdiff;h=b93144d82c9eb736820c039333b4070deb7e6a1a
commit b93144d82c9eb736820c039333b4070deb7e6a1a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:19 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 08176db..9b87567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-purchase-shipment-cost (2.6.1-1) experimental; urgency=low
+
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 04 May 2013 02:40:15 +0200
+
 tryton-modules-purchase-shipment-cost (2.6.0-1) experimental; urgency=low
 
   * Initial packaging.
commit 63a78f91dca499ee6360783cbbd49ffe234769d4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:13:01 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 776b559..4413e1c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2012 Cédric Krier
+Copyright: 2011-2013 Cédric Krier
            2011-2012 Bertrand Chenal
            2011 Nicolas Évrard
-           2011-2012 B2CK SPRL
+           2011-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 7a2ebecd8ea4daf73ae1535977642a99e23dcfaf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 01:57:09 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index c6d5b30..d05cbd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..87a90a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
 Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-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 350b1bc..fb52466 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_purchase_shipment_cost
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 5c65bd2..378a1cc 100644
--- a/stock.py
+++ b/stock.py
@@ -115,7 +115,7 @@ class ShipmentIn:
             move = cost['move']
             quantity = Decimal(str(move.quantity))
             if exp * quantity < difference:
-                cost['unit_shipment_cost'] = unit_shipment_cost + exp
+                cost['unit_shipment_cost'] += exp
                 difference -= exp * quantity
             if difference < exp:
                 break
@@ -128,8 +128,8 @@ class ShipmentIn:
             unit_shipment_cost = unit_shipment_cost.quantize(
                 exp, rounding=ROUND_HALF_EVEN)
             Move.write([move], {
-                    'unit_price': move.unit_price + cost['unit_shipment_cost'],
-                    'unit_shipment_cost': cost['unit_shipment_cost'],
+                    'unit_price': move.unit_price + unit_shipment_cost,
+                    'unit_shipment_cost': unit_shipment_cost,
                     })
 
     @classmethod
@@ -157,13 +157,15 @@ class Move:
     def _get_account_stock_move_lines(self, type_):
         pool = Pool()
         AccountMoveLine = pool.get('account.move.line')
+        Currency = pool.get('currency.currency')
         move_lines = super(Move, self)._get_account_stock_move_lines(type_)
         if (type_.startswith('in_')
                 and self.unit_shipment_cost
                 and self.shipment_in
                 and self.shipment_in.carrier):
-            shipment_cost = self.company.currency.round(
-                Decimal(str(self.quantity)) * self.unit_shipment_cost)
+            shipment_cost = Currency.compute(self.currency,
+                Decimal(str(self.quantity)) * self.unit_shipment_cost,
+                self.company.currency)
             shipment_cost_account = \
                 self.shipment_in.carrier.carrier_product.account_expense_used
             account = self.product.account_stock_supplier_used
diff --git a/tryton.cfg b/tryton.cfg
index 2f65365..e43208a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     carrier
     currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index 85716c6..174f3ab 100644
--- a/trytond_purchase_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-purchase-shipment-cost
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 0919a818690eeca8ba46775a63ef98970274cfea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:48 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 a66ca2c..c7ba7c0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,10 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-purchase-shipment-cost
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-carrier (>= 2.6), tryton-modules-currency (>= 2.6),
- tryton-modules-stock (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-carrier (>= ${version:major}),
+ tryton-modules-currency (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Purchase Shipment Cost 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 82ee13c4f7fb30e45f26e2e73fbcdc1cb6d7f282
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:48 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index c1f163c..2f3c4ce 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_purchase_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_purchase_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-purchase-shipment-cost

More information about the tryton-debian-vcs mailing list