[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch debian-jessie-3.4 updated. debian/3.4.1-1-6-g9681ce8

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:48:18 UTC 2016


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-purchase-shipment-cost.git;a=commitdiff;h=debian/3.4.1-1-6-g9681ce8

commit 9681ce832aa983b058ba2f40000f73c310457c3b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:38:26 2016 +0100

    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 44cbfcb..b9c2988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-purchase-shipment-cost (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.
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.4.2.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Dec 2016 11:38:26 +0100
+
 tryton-modules-purchase-shipment-cost (3.4.1-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit ce8a1567b8e2824b3917d93596c870abe8b4ad6a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:38:25 2016 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index b9f8e2c..5ee29bd 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-2015 Cédric Krier
+Copyright: 2011-2016 Cédric Krier
            2011-2012 Bertrand Chenal
-           2011-2015 Nicolas Évrard
-           2011-2015 B2CK SPRL
+           2011-2016 Nicolas Évrard
+           2011-2016 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 0a40c29dd6a34b93276b42eb50c27c0d3356de50
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:38:25 2016 +0100

    Merging upstream version 3.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index f1516ea..5435081 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.1 - 2015-02-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 61e9a99..08226b5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2015 Cédric Krier.
+Copyright (C) 2011-2016 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011-2015 Nicolas Évrard.
-Copyright (C) 2011-2015 B2CK SPRL.
+Copyright (C) 2011-2016 Nicolas Évrard.
+Copyright (C) 2011-2016 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 26accf4..213b3df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase_shipment_cost
-Version: 3.4.1
+Version: 3.4.2
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 67cc628..fb3e8a8 100644
--- a/stock.py
+++ b/stock.py
@@ -31,7 +31,7 @@ class ShipmentIn:
             'readonly': ~Eval('state').in_(['draft', 'assigned', 'packed']),
             }, depends=['carrier', 'state', 'cost_currency_digits'])
 
-    @fields.depends('currency')
+    @fields.depends('cost_currency')
     def on_change_with_cost_currency_digits(self, name=None):
         if self.cost_currency:
             return self.cost_currency.digits
diff --git a/tryton.cfg b/tryton.cfg
index 1892894..a349c4a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.4.2
 depends:
     carrier
     currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index 4d710e7..86f1b2d 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.1
 Name: trytond-purchase-shipment-cost
-Version: 3.4.1
+Version: 3.4.2
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_purchase_shipment_cost.egg-info/requires.txt b/trytond_purchase_shipment_cost.egg-info/requires.txt
index af28c2b..9bc227e 100644
--- a/trytond_purchase_shipment_cost.egg-info/requires.txt
+++ b/trytond_purchase_shipment_cost.egg-info/requires.txt
@@ -6,8 +6,8 @@ trytond >= 3.4, < 3.5
 [account_product]
 trytond_account_product >= 3.4, < 3.5
 
+[account_stock_anglo_saxon]
+trytond_account_stock_anglo_saxon >= 3.4, < 3.5
+
 [account_stock_continental]
 trytond_account_stock_continental >= 3.4, < 3.5
-
-[account_stock_anglo_saxon]
-trytond_account_stock_anglo_saxon >= 3.4, < 3.5
\ No newline at end of file
-- 
tryton-modules-purchase-shipment-cost



More information about the tryton-debian-vcs mailing list