changeset 8b220c599989 in modules/purchase_request:default
details:
https://hg.tryton.org/modules/purchase_request?cmd=changeset;node=8b220c599989
description:
Rename purchase request state from cancel to cancelled
issue8927
review301701003
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 4 ++--
purchase_request.py | 13 +++++++++----
tests/scenario_purchase_request.rst | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diffs (84 lines):
diff -r b58ab42d7ef7 -r 8b220c599989 CHANGELOG
--- a/CHANGELOG Mon May 04 12:24:25 2020 +0200
+++ b/CHANGELOG Sat Jun 06 10:02:09 2020 +0100
@@ -1,3 +1,5 @@
+* Rename purchase request state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Add employee on requests for some states
diff -r b58ab42d7ef7 -r 8b220c599989 doc/index.rst
--- a/doc/index.rst Mon May 04 12:24:25 2020 +0200
+++ b/doc/index.rst Sat Jun 06 10:02:09 2020 +0100
@@ -28,9 +28,9 @@
A purchase request is in state Done if it is linked to a Purchase
which is in state Done.
-* Cancel
+* Cancelled
- A purchase request is in state Cancel if it is linked to a Purchase
+ A purchase request is Cancelled if it is linked to a Purchase
which is cancelled.
A wizard allows to create purchases based on a selection of draft purchase
diff -r b58ab42d7ef7 -r 8b220c599989 purchase_request.py
--- a/purchase_request.py Mon May 04 12:24:25 2020 +0200
+++ b/purchase_request.py Sat Jun 06 10:02:09 2020 +0100
@@ -84,12 +84,12 @@
exception_ignored = fields.Boolean('Ignored Exception')
purchased_by = employee_field(
- "Purchased By", states=['purchased', 'done', 'cancel', 'exception'])
+ "Purchased By", states=['purchased', 'done', 'cancelled', 'exception'])
state = fields.Selection([
('purchased', "Purchased"),
('done', "Done"),
('draft', "Draft"),
- ('cancel', "Cancel"),
+ ('cancelled', "Cancelled"),
('exception', "Exception"),
], "State", required=True, readonly=True, select=True)
@@ -164,6 +164,11 @@
# Migration from 4.4: remove required on origin
tablehandler.not_null_action('origin', action='remove')
+ # Migration from 5.6: rename state cancel to cancelled
+ cursor.execute(*request.update(
+ [request.state], ['cancelled'],
+ where=request.state == 'cancel'))
+
def get_rec_name(self, name):
pool = Pool()
Lang = pool.get('ir.lang')
@@ -223,7 +228,7 @@
and not self.exception_ignored):
return 'exception'
elif self.purchase_line.purchase.state == 'cancel':
- return 'cancel'
+ return 'cancelled'
elif self.purchase_line.purchase.state == 'done':
return 'done'
else:
@@ -285,7 +290,7 @@
@classmethod
def view_attributes(cls):
return [
- ('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+ ('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
diff -r b58ab42d7ef7 -r 8b220c599989 tests/scenario_purchase_request.rst
--- a/tests/scenario_purchase_request.rst Mon May 04 12:24:25 2020 +0200
+++ b/tests/scenario_purchase_request.rst Sat Jun 06 10:02:09 2020 +0100
@@ -209,7 +209,7 @@
... 'purchase.request.handle.purchase.cancellation', [pr])
>>> handle_exception.execute('cancel_request')
>>> pr.state
- 'cancel'
+ 'cancelled'
Re-create the purchase request::
