From 5d2dfc74af09e42ad088f77c14f3ed876673cf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 Oct 2013 17:41:15 +0200 Subject: [PATCH 1/6] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index bbb5e93669..651d7df56f 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.0 +version=3.0.1 depends: company currency From a694a8eb4361a62cb0545d6866e3d8d65538dab7 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Wed, 11 Dec 2013 17:36:24 +0100 Subject: [PATCH 2/6] re-allow internal shipment from/to lost and found locations review2181002 issue3544 (transplanted from f5ce03ef9558960ef68e0592c9235632bb181788) --- shipment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shipment.py b/shipment.py index 9c50a08100..ad12a3041a 100644 --- a/shipment.py +++ b/shipment.py @@ -1777,14 +1777,14 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView): Bool(Eval('moves'))), }, domain=[ - ('type', 'in', ['storage']), + ('type', 'in', ['storage', 'lost_found']), ], depends=['state', 'moves']) to_location = fields.Many2One('stock.location', "To Location", required=True, states={ 'readonly': Or(Not(Equal(Eval('state'), 'draft')), Bool(Eval('moves'))), }, domain=[ - ('type', 'in', ['storage']), + ('type', 'in', ['storage', 'lost_found']), ], depends=['state', 'moves']) moves = fields.One2Many('stock.move', 'shipment', 'Moves', states={ From c6c64f1f241be7804651cde71cda17fd7cdae224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 12 Dec 2013 13:50:05 +0100 Subject: [PATCH 3/6] Missing test on address before using it issue3531 review2021002 (transplanted from 904d8e35be3bbc43907782d469925e0a7175126c) --- shipment.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/shipment.py b/shipment.py index ad12a3041a..80c0be1be3 100644 --- a/shipment.py +++ b/shipment.py @@ -260,10 +260,10 @@ class ShipmentIn(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_supplier(self): - if not self.supplier: - return {'contact_address': None} - address = self.supplier.address_get() - return {'contact_address': address.id} + address = None + if self.supplier: + address = self.supplier.address_get() + return {'contact_address': address.id if address else None} def on_change_with_supplier_location(self, name=None): if self.supplier: @@ -991,10 +991,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_customer(self): - if not self.customer: - return {'delivery_address': None} - address = self.customer.address_get(type='delivery') - return {'delivery_address': address.id} + address = None + if self.customer: + address = self.customer.address_get(type='delivery') + return {'delivery_address': address.id if address else None} def on_change_with_customer_location(self, name=None): if self.customer: @@ -1493,11 +1493,11 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_customer(self): - if not self.customer: - return {'delivery_address': None} - address = self.customer.address_get(type='delivery') + address = None + if self.customer: + address = self.customer.address_get(type='delivery') return { - 'delivery_address': address.id, + 'delivery_address': address.id if address else None, } def on_change_with_customer_location(self, name=None): From 0fad86f7d311266344fd9897b4810d4bf9fc8cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:47:28 +0100 Subject: [PATCH 4/6] Prepare release 3.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9e73b97ff3..e2c30716e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 3.0.1 - 2014-01-18 +* Bug fixes (see mercurial logs for details) + Version 3.0.0 - 2013-10-21 * Bug fixes (see mercurial logs for details) * Add Mixin class with helper to setup stock quantity fields From facd6bc8047713d0fb52fb4e0aaad9e524321264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:47:29 +0100 Subject: [PATCH 5/6] Added tag 3.0.1 for changeset 3aef2186164c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 38bd129006..2f3fa768ee 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 be073cc040e1ea0eabf77e09eaa8c8c97062e3ab 2.6.0 83de8e4076f99f7247dc034a909a85a0dc500d84 2.8.0 1e2bd2e0ec24c7c6109d38625e90462dffb18c13 3.0.0 +3aef2186164c1a99aaf2780086e3e316083a43e1 3.0.1 From 8cbddf9a8fb3815b4a05d774b2e0121cd9bfa0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 18 Jan 2014 20:47:43 +0100 Subject: [PATCH 6/6] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 651d7df56f..3d61757d7d 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.1 +version=3.0.2 depends: company currency