[tryton-debian-vcs] tryton-modules-stock branch debian updated. debian/3.0.0-2-2-gbf1492a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jan 19 19:05:28 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.0.0-2-2-gbf1492a
commit bf1492ae413bede9e4ef25f2462c0c44ee8e496f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 19 20:05:06 2014 +0100
Releasing debian version 3.0.1-1.
diff --git a/debian/changelog b/debian/changelog
index ed19abf..40718a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (3.0.1-1) unstable; urgency=medium
+
+ * Merging upstream version 3.0.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 19 Jan 2014 19:41:59 +0100
+
tryton-modules-stock (3.0.0-2) unstable; urgency=low
* Pointing VCS fields to new location on alioth.debian.org.
commit 77ce587ac4ae6cbf4c38909b51503f8f439a4dc8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 19 19:38:20 2014 +0100
Merging upstream version 3.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 9e73b97..e2c3071 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
diff --git a/PKG-INFO b/PKG-INFO
index dd79515..be9e89d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.0.0
+Version: 3.0.1
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/shipment.py b/shipment.py
index 9c50a08..80c0be1 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):
@@ -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={
diff --git a/tryton.cfg b/tryton.cfg
index bbb5e93..651d7df 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.0.1
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index e32e3bf..f2715e7 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock
-Version: 3.0.0
+Version: 3.0.1
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list