From 1fea7ee3ead364655bd86ad9abdf6409792aa6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 25 Oct 2011 10:52:26 +0200 Subject: [PATCH 01/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 16f9337a1e..d9278ad309 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Verkauf Lieferposten Kosten', 'name_es_ES': 'Costo del método de envio', 'name_fr_FR': "Coût d'expédition de vente", - 'version' : '2.2.0', + 'version' : '2.2.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4399df70877d402e797679721d0fd67c56e7f1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 28 Oct 2011 11:05:25 +0200 Subject: [PATCH 02/24] Use correct variable name (transplanted from a575944d73fabd08bc4243ad3e29d7be3c165c7c) --- stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock.py b/stock.py index a53d73e746..a8fa21cfd6 100644 --- a/stock.py +++ b/stock.py @@ -91,7 +91,7 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): currency_obj = pool.get('currency.currency') try: - result = super(ShipmentOut, self).on_change_lines(value) + result = super(ShipmentOut, self).on_change_lines(values) except AttributeError: result = {} carrier = carrier_obj.browse(values['carrier']) From 59a7fccedda14418b4956e93dc5a9ac60b50e9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 2 Dec 2011 10:17:05 +0100 Subject: [PATCH 03/24] Don't force database name in scenario (transplanted from 984787c071046058733e9fa1d108709d6d698c12) --- tests/scenario_sale_shipment_cost.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/scenario_sale_shipment_cost.rst b/tests/scenario_sale_shipment_cost.rst index f0dff378b5..b5ec8546f3 100644 --- a/tests/scenario_sale_shipment_cost.rst +++ b/tests/scenario_sale_shipment_cost.rst @@ -16,7 +16,8 @@ Imports:: Create database:: - >>> config = config.set_trytond(':memory:') + >>> config = config.set_trytond() + >>> config.pool.test = True Install sale_shipment_cost, sale and account_invoice:: From 93a68fcd15813e2c70250e05d4ccc6cde7b14079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Dec 2011 19:45:53 +0100 Subject: [PATCH 04/24] cost_line could be empty dictionary if there is no cost (transplanted from ebb11dd2659394e1fca65c231a3647c1a4647d76) --- sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.py b/sale.py index c8449b68fe..0ca22af071 100644 --- a/sale.py +++ b/sale.py @@ -154,7 +154,7 @@ class Sale(Model): values['lines'] = [] for line in values['lines']: if line.get('shipment_cost'): - if line['shipment_cost'] != cost_line['shipment_cost']: + if line['shipment_cost'] != cost_line.get('shipment_cost'): to_remove = line['id'] values['lines'].remove(line) if cost_line: From 52a2177ef273a4ddc5682b25240a20efca069a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 9 Dec 2011 16:01:47 +0100 Subject: [PATCH 05/24] Add missing stock dependency (transplanted from e955fb62728320f973d2f3ebda28b38f6563ab2a) --- INSTALL | 1 + __tryton__.py | 1 + 2 files changed, 2 insertions(+) diff --git a/INSTALL b/INSTALL index 6afabc18df..308527dfa3 100644 --- a/INSTALL +++ b/INSTALL @@ -10,6 +10,7 @@ Prerequisites * trytond_sale (http://www.tryton.org/) * trytond_currency (http://www.tryton.org/) * trytond_account_invoice (http://www.tryton.org/) + * trytond_stock (http://www.tryton.org/) Installation ------------ diff --git a/__tryton__.py b/__tryton__.py index d9278ad309..925648cd78 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -23,6 +23,7 @@ 'sale', 'currency', 'account_invoice', + 'stock', ], 'xml' : [ 'sale.xml', From 870fb2427668053880da83b134b27f3ee8668e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 17 Dec 2011 12:08:03 +0100 Subject: [PATCH 06/24] Add missing REPORT_ONLY_FIRST_FAILURE on doctest (transplanted from 166ba6757e4706759d9091f64df64ea7b84d3028) --- tests/test_sale_shipment_cost.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_sale_shipment_cost.py b/tests/test_sale_shipment_cost.py index bed36d0328..ea08c384ef 100644 --- a/tests/test_sale_shipment_cost.py +++ b/tests/test_sale_shipment_cost.py @@ -51,7 +51,8 @@ def suite(): suite.addTests(unittest.TestLoader().loadTestsFromTestCase( SaleShipmentCostTestCase)) suite.addTests(doctest.DocFileSuite('scenario_sale_shipment_cost.rst', - setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8')) + setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8', + optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) return suite if __name__ == '__main__': From d7db6866d3fd0bade670c593d7aeb6ea55c9b6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 17 Dec 2011 12:10:45 +0100 Subject: [PATCH 07/24] Fix typo in the super call to on_change_inventory_moves (transplanted from c750ed17661195b9c7600773ef6b3a6e86ee0609) --- stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock.py b/stock.py index a8fa21cfd6..c6e998b3d4 100644 --- a/stock.py +++ b/stock.py @@ -91,7 +91,7 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): currency_obj = pool.get('currency.currency') try: - result = super(ShipmentOut, self).on_change_lines(values) + result = super(ShipmentOut, self).on_change_inventory_moves(values) except AttributeError: result = {} carrier = carrier_obj.browse(values['carrier']) From d7c7b8dda47da57c5d5484fa3a35b32f4cec6422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 17 Dec 2011 12:11:51 +0100 Subject: [PATCH 08/24] Fix on_change_inventory_moves when carrier is not filled (transplanted from f7c5f714b76771840721a6fa601162fca33eff64) --- stock.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stock.py b/stock.py index c6e998b3d4..4d975b5dea 100644 --- a/stock.py +++ b/stock.py @@ -94,6 +94,8 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): result = super(ShipmentOut, self).on_change_inventory_moves(values) except AttributeError: result = {} + if not values.get('carrier'): + return result carrier = carrier_obj.browse(values['carrier']) with Transaction().set_context( self._get_carrier_context(values)): From bba19d70f88e03beaf63b60e11d283adc24f0594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 17 Dec 2011 12:12:47 +0100 Subject: [PATCH 09/24] create_shipment returns a list of shipments now (transplanted from 50f58f95c82912b70b7af33de77ee5802331e25b) --- sale.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sale.py b/sale.py index 0ca22af071..e68e14afcf 100644 --- a/sale.py +++ b/sale.py @@ -182,20 +182,23 @@ class Sale(Model): shipment_obj = pool.get('stock.shipment.out') carrier_obj = pool.get('carrier') - shipment_id = super(Sale, self).create_shipment(sale_id) + shipment_ids = super(Sale, self).create_shipment(sale_id) sale = self.browse(sale_id) - if shipment_id and sale.carrier: - shipment = shipment_obj.browse(shipment_id) - with Transaction().set_context( - shipment_obj.get_carrier_context(shipment)): - cost, currency_id = carrier_obj.get_sale_price(sale.carrier) - with Transaction().set_user(0, set_context=True): - shipment_obj.write(shipment_id, { - 'carrier': sale.carrier.id, - 'cost': cost, - 'cost_currency': currency_id, - }) - return shipment_id + if shipment_ids and sale.carrier: + shipments = shipment_obj.browse(shipment_ids) + for shipment in shipments: + with Transaction().set_context( + shipment_obj.get_carrier_context(shipment, values={ + 'carrier': sale.carrier.id, + })): + cost, currency_id = carrier_obj.get_sale_price(sale.carrier) + with Transaction().set_user(0, set_context=True): + shipment_obj.write(shipment.id, { + 'carrier': sale.carrier.id, + 'cost': cost, + 'cost_currency': currency_id, + }) + return shipment_ids def _get_invoice_line_sale_line(self, sale): result = super(Sale, self)._get_invoice_line_sale_line(sale) From 841a12cc9d27e88eca78843984ab0809e4395210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 17 Dec 2011 22:30:00 +0100 Subject: [PATCH 10/24] Use comparison in doctest doctest fails if we got an integer instead of float (transplanted from 8a0914a419aa0f8dd3cf706e5d9fb41146655df0) --- tests/scenario_sale_shipment_cost.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/scenario_sale_shipment_cost.rst b/tests/scenario_sale_shipment_cost.rst index b5ec8546f3..72de62d3fa 100644 --- a/tests/scenario_sale_shipment_cost.rst +++ b/tests/scenario_sale_shipment_cost.rst @@ -185,8 +185,8 @@ Sale products with cost on shipment:: >>> cost_line = sale.lines[-1] >>> cost_line.product == carrier_product True - >>> cost_line.quantity - 1.0 + >>> cost_line.quantity == 1 + True >>> cost_line.amount == Decimal('3') True >>> sale.save() @@ -254,8 +254,8 @@ Sale products with cost on order:: >>> cost_line = sale.lines[-1] >>> cost_line.product == carrier_product True - >>> cost_line.quantity - 1.0 + >>> cost_line.quantity == 1 + True >>> cost_line.amount == Decimal('3') True >>> sale.save() From eae88638af8627c2abe8311afb74cdd63b57c2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 23 Dec 2011 17:16:29 +0100 Subject: [PATCH 11/24] Add missing currency_obj in get_cost_invoice_line --- stock.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stock.py b/stock.py index 4d975b5dea..65d3450efa 100644 --- a/stock.py +++ b/stock.py @@ -114,6 +114,7 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): pool = Pool() product_obj = pool.get('product.product') tax_rule_obj = pool.get('account.tax.rule') + currency_obj = pool.get('currency.currency') if not shipment.cost: return {} From 93fdb64ae4491e61331772de054af408f56cfc8b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:41:07 +0100 Subject: [PATCH 12/24] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a2f2820715..a5e91b931d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-25 * Bug fixes (see mercurial logs for details) From 6dfffe1772ee149b69c69f018f8385e32ad14bc5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:41:07 +0100 Subject: [PATCH 13/24] Added tag 2.2.1 for changeset a5699e0ba0bf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f17b987260..d5ac1ef2cb 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 71a276c5d18a81476b1545a4d958cda80c4450ab 2.0.0 36b22ce15af6266455a7344bdb1b7708658a3918 2.2.0 +a5699e0ba0bfb209907492c8da8c19cd02d183aa 2.2.1 From 9e49c6a3741ede0ba5a28b9e9674a90f2f510095 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:41:10 +0100 Subject: [PATCH 14/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 925648cd78..97979bee31 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Verkauf Lieferposten Kosten', 'name_es_ES': 'Costo del método de envio', 'name_fr_FR': "Coût d'expédition de vente", - 'version' : '2.2.1', + 'version': '2.2.2', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7b2f59b30f9de9a1a5502a599ee8dab232b7bc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 23 Dec 2011 17:48:10 +0100 Subject: [PATCH 15/24] Allow to update cost also in waiting state (transplanted from 929e81dc3752a69f0e3e0e671cf822093c84bf53) --- stock.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index 65d3450efa..eee9b39408 100644 --- a/stock.py +++ b/stock.py @@ -19,7 +19,8 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): 'Cost Currency', states={ 'invisible': ~Eval('carrier'), 'required': Bool(Eval('carrier')), - 'readonly': ~Eval('state').in_(['draft', 'assigned', 'packed']), + 'readonly': ~Eval('state').in_(['draft', 'waiting', 'assigned', + 'packed']), }, depends=['carrier', 'state']) cost_currency_digits = fields.Function(fields.Integer( 'Cost Currency Digits', on_change_with=['currency']), @@ -27,7 +28,8 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): cost = fields.Numeric('Cost', digits=(16, Eval('cost_currency_digits', 2)), states={ 'invisible': ~Eval('carrier'), - 'readonly': ~Eval('state').in_(['draft', 'assigned', 'packed']), + 'readonly': ~Eval('state').in_(['draft', 'waiting', 'assigned', + 'packed']), }, depends=['carrier', 'state', 'cost_currency_digits']) cost_invoice_line = fields.Many2One('account.invoice.line', 'Cost Invoice Line', readonly=True) From f1323eb4d9e3df63d08c6170fb01bbe1e2305981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 6 Feb 2012 19:42:59 +0100 Subject: [PATCH 16/24] Fix computation of stockable review230005 (transplanted from 6c3cd5e4e4908d1c98468e8b1b33ca85d3ed6dfc) --- sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index e68e14afcf..2b10dffd5a 100644 --- a/sale.py +++ b/sale.py @@ -107,7 +107,8 @@ class Sale(Model): cost_line = {} product_ids = [line['product'] for line in values.get('lines') or [] if line.get('product')] - stockable = any(product.salable for product in product_obj.browse(product_ids)) + stockable = any(product.type in ('stockable', 'consumable') + for product in product_obj.browse(product_ids)) if cost and currency_id and stockable: if (values.get('currency') and currency_id != values['currency']): From e118fc13ad600cba9b6d83d3c5ab97442e882ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Apr 2012 13:22:22 +0200 Subject: [PATCH 17/24] Use default values when adding a record via on_change review325001 (transplanted from 9851c07f50504f047d8dbc0bdb440be4256aa9a2) --- sale.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sale.py b/sale.py index 2b10dffd5a..9d55885529 100644 --- a/sale.py +++ b/sale.py @@ -120,18 +120,20 @@ class Sale(Model): with Transaction().set_context(party_context): description = product_obj.browse(product.id).rec_name taxes = [] - cost_line = { - 'type': 'line', - 'product': product.id, - 'description': description, - 'quantity': 1, #XXX - 'unit': product.sale_uom.id, - 'unit_price': cost, - 'shipment_cost': cost, - 'amount': cost, - 'taxes': taxes, - 'sequence': 9999, #XXX - } + cost_line = sale_line_obj.default_get( + sale_line_obj._columns.keys()) + cost_line.update({ + 'type': 'line', + 'product': product.id, + 'description': description, + 'quantity': 1, # XXX + 'unit': product.sale_uom.id, + 'unit_price': cost, + 'shipment_cost': cost, + 'amount': cost, + 'taxes': taxes, + 'sequence': 9999, # XXX + }) pattern = sale_line_obj._get_tax_rule_pattern(party, cost_line) for tax in product.customer_taxes_used: From 5c5873f67bd6e2606ca4b4d67b4b351355c270a9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:11 +0200 Subject: [PATCH 18/24] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a5e91b931d..e8f316b4de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2011-12-26 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 2e03509ddd..c6901ede17 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ -Copyright (C) 2011 Cédric Krier. +Copyright (C) 2011-2012 Cédric Krier. Copyright (C) 2011 Bertrand Chenal. Copyright (C) 2011 Nicolas Évrard. -Copyright (C) 2011 B2CK SPRL. +Copyright (C) 2011-2012 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 From 22f84b456d89911d485cfac11fd4593b8ecf8a43 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:12 +0200 Subject: [PATCH 19/24] Added tag 2.2.2 for changeset cfd1a587c0cd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d5ac1ef2cb..0e60d56d79 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 71a276c5d18a81476b1545a4d958cda80c4450ab 2.0.0 36b22ce15af6266455a7344bdb1b7708658a3918 2.2.0 a5699e0ba0bfb209907492c8da8c19cd02d183aa 2.2.1 +cfd1a587c0cd3d191b97d1d0f0b435e45d6b2cc8 2.2.2 From eb861d8648ffd93954aad0aba9cb5f4e3ff73ff5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:16 +0200 Subject: [PATCH 20/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 97979bee31..97c5805810 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Verkauf Lieferposten Kosten', 'name_es_ES': 'Costo del método de envio', 'name_fr_FR': "Coût d'expédition de vente", - 'version': '2.2.2', + 'version': '2.2.3', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1cfcb79d8c538f800d09aa0d9caa0a4a4d78a625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Mar 2013 22:45:15 +0100 Subject: [PATCH 21/24] Fix wrong depends on sale_shipment_cost_method (transplanted from 6454af59837665161b123e575ce790b70ae483e0) --- sale.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sale.py b/sale.py index 9d55885529..6dbd41f1fd 100644 --- a/sale.py +++ b/sale.py @@ -19,8 +19,7 @@ class Configuration(Model): ], 'Sale Shipment Cost Method', states={ 'required': Bool(Eval('context', {}).get('company', 0)), - }, - depends=['company'])) + })) def default_sale_shipment_cost_method(self): return 'shipment' From 0e7b3a9c510570c35cc9d381eb3ef91009064a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:03:20 +0200 Subject: [PATCH 22/24] Prepare release 2.2.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e8f316b4de..e7f4550c13 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.3 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.2 - 2012-05-07 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index c6901ede17..d78152c422 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 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 From 83b5f0d3073f00a0a5715f8ad933fa63db55e5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:03:21 +0200 Subject: [PATCH 23/24] Added tag 2.2.3 for changeset edc5ea0f6eac --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0e60d56d79..2c5effe994 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ 36b22ce15af6266455a7344bdb1b7708658a3918 2.2.0 a5699e0ba0bfb209907492c8da8c19cd02d183aa 2.2.1 cfd1a587c0cd3d191b97d1d0f0b435e45d6b2cc8 2.2.2 +edc5ea0f6eac3e1a9f91737a364197d6ad83f72f 2.2.3 From bc233c84ee5f07a02763bca0075fd3c45522a5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:03:28 +0200 Subject: [PATCH 24/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 97c5805810..2d629d9056 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_de_DE': 'Verkauf Lieferposten Kosten', 'name_es_ES': 'Costo del método de envio', 'name_fr_FR': "Coût d'expédition de vente", - 'version': '2.2.3', + 'version': '2.2.4', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',